summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2009-03-17 08:43:29 +0000
committerGordon Sim <gsim@apache.org>2009-03-17 08:43:29 +0000
commitcfb70abb147ecb9e9ace913074488306c803f206 (patch)
treeb3d7483d9a978544c2b960b2b7c98712d1a0aa13
parent4a235ffeb36db975743e0dc64c5e7b41e0157d25 (diff)
downloadqpid-python-cfb70abb147ecb9e9ace913074488306c803f206.tar.gz
QPID-1741: Fix for later versions of boost test API (from Jan Sarenik)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@755152 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/tests/unit_test.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/unit_test.h b/qpid/cpp/src/tests/unit_test.h
index df3ebfb1fe..fc542e62ad 100644
--- a/qpid/cpp/src/tests/unit_test.h
+++ b/qpid/cpp/src/tests/unit_test.h
@@ -61,7 +61,14 @@
namespace { struct test_name { void test_method(); }; } \
void test_name::test_method()
-#endif // Workaround for BOOST_AUTO_TEST_SUITE_EXPECTED_FAILURES
+#endif // Workaround for BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES
+
+// Correct syntax for boost > 1.36
+#if (BOOST_VERSION > 103500)
+# define QPID_AUTO_TEST_CASE_EXPECTED_FAILURES(name,n) \
+ BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES(name,n) \
+ BOOST_AUTO_TEST_CASE(name)
+#endif // Correct syntax for boost > 1.36
//
// Default definitions for latest version of boost.