diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2008-04-17 21:46:22 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2008-04-17 21:46:22 +0000 |
| commit | cfde776724c2f214b962dc8077ddca8305ddd705 (patch) | |
| tree | 852a49ea858393a93886ac7dd3a5d0863ca4a935 /cpp/src/tests/test_tools.h | |
| parent | 20e4466ca57bc7bdc81ca0857549a63c77f41d8a (diff) | |
| download | qpid-python-cfde776724c2f214b962dc8077ddca8305ddd705.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/qpid@649294 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/test_tools.h')
| -rw-r--r-- | cpp/src/tests/test_tools.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/tests/test_tools.h b/cpp/src/tests/test_tools.h index c5451643be..32127b0442 100644 --- a/cpp/src/tests/test_tools.h +++ b/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()) |