diff options
| -rw-r--r-- | cpp/src/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/src/tests/unit_test.h | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index c5baf5c73b..bd020e4f77 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -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 abs_builddir=@abs_builddir@ diff --git a/cpp/src/tests/unit_test.h b/cpp/src/tests/unit_test.h index e757961616..b986c74afa 100644 --- a/cpp/src/tests/unit_test.h +++ b/cpp/src/tests/unit_test.h @@ -45,18 +45,12 @@ # 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 // #if (BOOST_VERSION < 103500) |