summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/test_tools.h
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2008-04-17 21:46:22 +0000
committerAndrew Stitcher <astitcher@apache.org>2008-04-17 21:46:22 +0000
commit1b4a961ec807e5e61cd232b08020a935a4f76f4c (patch)
treea696732d72bd36cac2f8d6dff7d41debf3fb89c0 /qpid/cpp/src/tests/test_tools.h
parentf89c4bab5b5414796ca104d9a9a6c7fc138e10cd (diff)
downloadqpid-python-1b4a961ec807e5e61cd232b08020a935a4f76f4c.tar.gz
Patch for improved compatibility with gcc 3.4 and boost 1.33
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@649294 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/test_tools.h')
-rw-r--r--qpid/cpp/src/tests/test_tools.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/test_tools.h b/qpid/cpp/src/tests/test_tools.h
index c5451643be..32127b0442 100644
--- a/qpid/cpp/src/tests/test_tools.h
+++ b/qpid/cpp/src/tests/test_tools.h
@@ -68,8 +68,12 @@ inline bool regexPredicate(const std::string& re, const std::string& text) {
}
/** Check for regular expression match. You must #include <boost/regex.hpp> */
-#define BOOST_CHECK_REGEX(re, text) \
+#if (BOOST_VERSION < 103300)
+ #define BOOST_CHECK_REGEX(re, text)
+#else
+ #define BOOST_CHECK_REGEX(re, text) \
BOOST_CHECK_PREDICATE(regexPredicate, (re)(text))
+#endif
/** Check if types of two objects (as given by typeinfo::name()) match. */
#define BOOST_CHECK_TYPEID_EQUAL(a,b) BOOST_CHECK_EQUAL(typeid(a).name(),typeid(b).name())