Author: aconway
Date: Wed Apr 23 15:13:14 2008
New Revision: 651088
URL: http://svn.apache.org/viewvc?rev=651088&view=rev
Log:
Fix build error introduced by earlier commit.
Modified:
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/unit_test.h
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=651088&r1=651087&r2=651088&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Wed Apr 23 15:13:14 2008
@@ -1,4 +1,4 @@
-AM_CXXFLAG = $(WARNING_CFLAGS) $(CPPUNIT_CXXFLAGS) $(APR_CXXFLAGS)
-DBOOST_TEST_DYN_LINK
+AM_CXXFLAGS = $(WARNING_CFLAGS) $(CPPUNIT_CXXFLAGS) $(APR_CXXFLAGS)
-DBOOST_TEST_DYN_LINK
INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../gen -I$(top_builddir)/src/gen
[EMAIL PROTECTED]@
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/unit_test.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/unit_test.h?rev=651088&r1=651087&r2=651088&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/unit_test.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/unit_test.h Wed Apr 23 15:13:14 2008
@@ -45,17 +45,11 @@
# define QPID_AUTO_TEST_SUITE_END()
#elif (BOOST_VERSION < 103400)
-
+// Note the trailing ';'
# define QPID_AUTO_TEST_SUITE(name) BOOST_AUTO_TEST_SUITE(name);
# define QPID_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END();
-#elif (BOOST_VERSION < 103400)
-
-# define QPID_AUTO_TEST_SUITE(name) BOOST_AUTO_TEST_SUITE(name)
-# define QPID_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
-
#endif // Workarounds for BOOST_AUTO_TEST_CASE|SUITE|SUITE_END
-
// Workaround for BOOST_AUTO_TEST_SUITE_EXPECTED_FAILURES
//
