diff options
| author | Alan Conway <aconway@apache.org> | 2010-10-21 19:05:01 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-10-21 19:05:01 +0000 |
| commit | 3c8968ee65bbcc08e7b4e948dbee0518c6a4b6bd (patch) | |
| tree | 18ba45a6b5cbfbedfd68772f11cf82040d5c3bc4 /qpid/cpp/src/tests/test_tools.h | |
| parent | a1802c698078787d5ac332b72d8b6ebe75cee286 (diff) | |
| download | qpid-python-3c8968ee65bbcc08e7b4e948dbee0518c6a4b6bd.tar.gz | |
Get rid of boost::regex in test code.
It was barely being used and it causes portability problems on older versions of boost.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1026103 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/test_tools.h')
| -rw-r--r-- | qpid/cpp/src/tests/test_tools.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/qpid/cpp/src/tests/test_tools.h b/qpid/cpp/src/tests/test_tools.h index bb2509fd32..de672f938a 100644 --- a/qpid/cpp/src/tests/test_tools.h +++ b/qpid/cpp/src/tests/test_tools.h @@ -23,7 +23,6 @@ #include <limits.h> // Include before boost/test headers. #include <boost/test/test_tools.hpp> #include <boost/assign/list_of.hpp> -#include <boost/regex.hpp> #include <boost/assign/list_of.hpp> #include <vector> #include <set> @@ -75,21 +74,6 @@ bool operator == (const boost::assign_detail::generic_list<T>& b, const set<T>& namespace qpid { namespace tests { -/** NB: order of parameters is regex first, in line with - * CHECK(expected, actual) convention. - */ -inline bool regexPredicate(const std::string& re, const std::string& text) { - return boost::regex_match(text, boost::regex(re)); -} - -/** Check for regular expression match. You must #include <boost/regex.hpp> */ -#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()) |