Subject: [Boost-commit] svn:boost r57838 - in trunk/libs/unordered/test: exception helpers unordered
From: daniel_james_at_[hidden]
Date: 2009-11-21 14:40:29
Author: danieljames
Date: 2009-11-21 14:40:28 EST (Sat, 21 Nov 2009)
New Revision: 57838
URL: http://svn.boost.org/trac/boost/changeset/57838
Log:
Inspect fixes.
Text files modified:
trunk/libs/unordered/test/exception/assign_exception_tests.cpp | 6 ++++--
trunk/libs/unordered/test/exception/erase_exception_tests.cpp | 2 +-
trunk/libs/unordered/test/exception/insert_exception_tests.cpp | 6 +++---
trunk/libs/unordered/test/exception/rehash_exception_tests.cpp | 4 +++-
trunk/libs/unordered/test/exception/swap_exception_tests.cpp | 4 ++--
trunk/libs/unordered/test/helpers/exception_test.hpp | 2 +-
trunk/libs/unordered/test/unordered/incomplete_test.cpp | 2 +-
7 files changed, 15 insertions(+), 11 deletions(-)
Modified: trunk/libs/unordered/test/exception/assign_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/assign_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/assign_exception_tests.cpp 2009-11-21 14:40:28 EST (Sat, 21 Nov 2009)
@@ -22,7 +22,8 @@
typedef T data_type;
T init() const { return T(values.begin(), values.end()); }
void run(T& x) const { x = x; }
- void check(T const& x) const { test::check_equivalent_keys(x); }
+ void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const
+ { test::check_equivalent_keys(x); }
};
template <class T>
@@ -52,7 +53,8 @@
typedef T data_type;
T init() const { return T(x); }
void run(T& x1) const { x1 = y; }
- void check(T const& x1) const { test::check_equivalent_keys(x1); }
+ void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x1) const
+ { test::check_equivalent_keys(x1); }
};
template <class T>
Modified: trunk/libs/unordered/test/exception/erase_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/erase_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/erase_exception_tests.cpp 2009-11-21 14:40:28 EST (Sat, 21 Nov 2009)
@@ -22,7 +22,7 @@
return T(values.begin(), values.end());
}
- void check(T const& x) const {
+ void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const {
std::string scope(test::scope);
BOOST_TEST(scope.find("hash::") != std::string::npos ||
Modified: trunk/libs/unordered/test/exception/insert_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/insert_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/insert_exception_tests.cpp 2009-11-21 14:40:28 EST (Sat, 21 Nov 2009)
@@ -27,7 +27,7 @@
return T();
}
- void check(T const& x, strong_type const& strong) const {
+ void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x, strong_type const& strong) const {
std::string scope(test::scope);
if(scope.find("hash::operator()") == std::string::npos)
@@ -92,7 +92,7 @@
x.insert(this->values.begin(), this->values.end());
}
- void check(T const& x) const {
+ void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const {
test::check_equivalent_keys(x);
}
};
@@ -215,7 +215,7 @@
BOOST_TEST(x.bucket_count() != bucket_count);
}
- void check(T const& x) const {
+ void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const {
if(x.size() < rehash_bucket_count) {
//BOOST_TEST(x.bucket_count() == original_bucket_count);
}
Modified: trunk/libs/unordered/test/exception/rehash_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/rehash_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/rehash_exception_tests.cpp 2009-11-21 14:40:28 EST (Sat, 21 Nov 2009)
@@ -28,7 +28,9 @@
return x;
}
- void check(T const& x, strong_type const& strong) const {
+ void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x,
+ strong_type const& strong) const
+ {
std::string scope(test::scope);
if(scope.find("hash::operator()") == std::string::npos &&
Modified: trunk/libs/unordered/test/exception/swap_exception_tests.cpp
==============================================================================
--- trunk/libs/unordered/test/exception/swap_exception_tests.cpp (original)
+++ trunk/libs/unordered/test/exception/swap_exception_tests.cpp 2009-11-21 14:40:28 EST (Sat, 21 Nov 2009)
@@ -22,7 +22,7 @@
typedef T data_type;
T init() const { return T(values.begin(), values.end()); }
void run(T& x) const { x.swap(x); }
- void check(T const& x) const {
+ void check BOOST_PREVENT_MACRO_SUBSTITUTION(T const& x) const {
std::string scope(test::scope);
#if BOOST_UNORDERED_SWAP_METHOD != 2
@@ -77,7 +77,7 @@
d.x.swap(d.y);
} catch (std::runtime_error) {}
}
- void check(data_type const& d) const {
+ void check BOOST_PREVENT_MACRO_SUBSTITUTION(data_type const& d) const {
std::string scope(test::scope);
#if BOOST_UNORDERED_SWAP_METHOD != 2
Modified: trunk/libs/unordered/test/helpers/exception_test.hpp
==============================================================================
--- trunk/libs/unordered/test/helpers/exception_test.hpp (original)
+++ trunk/libs/unordered/test/helpers/exception_test.hpp 2009-11-21 14:40:28 EST (Sat, 21 Nov 2009)
@@ -110,7 +110,7 @@
template <class T> void test(T const&) const {}
};
data_type init() const { return data_type(); }
- void check() const {}
+ void check BOOST_PREVENT_MACRO_SUBSTITUTION() const {}
};
template <class T, class P1, class P2, class T2>
Modified: trunk/libs/unordered/test/unordered/incomplete_test.cpp
==============================================================================
--- trunk/libs/unordered/test/unordered/incomplete_test.cpp (original)
+++ trunk/libs/unordered/test/unordered/incomplete_test.cpp 2009-11-21 14:40:28 EST (Sat, 21 Nov 2009)
@@ -36,4 +36,4 @@
m2.insert(std::make_pair(test::value(), test::value()));
s1.insert(test::value());
s2.insert(test::value());
-}
\ No newline at end of file
+}