feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Inspect fixes.

Browse Source 
[SVN r57838]
This commit is contained in:
Daniel James
2009-11-21 19:40:28 +00:00
parent df72c4886f
commit 3882a61065
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/exception/assign_exception_tests.cpp
View File

@ -22,7 +22,8 @@ struct self_assign_base : public test::exception_base
typedef T data_type; typedef T data_type;
T init() const { return T(values.begin(), values.end()); } T init() const { return T(values.begin(), values.end()); }
void run(T& x) const { x = x; } 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> template <class T>
@ -52,7 +53,8 @@ struct assign_base : public test::exception_base
typedef T data_type; typedef T data_type;
T init() const { return T(x); } T init() const { return T(x); }
void run(T& x1) const { x1 = y; } 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> template <class T>

2
test/exception/erase_exception_tests.cpp
View File

@ -22,7 +22,7 @@ struct erase_test_base : public test::exception_base
return T(values.begin(), values.end()); 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); std::string scope(test::scope);
BOOST_TEST(scope.find("hash::") != std::string::npos || BOOST_TEST(scope.find("hash::") != std::string::npos ||

6
test/exception/insert_exception_tests.cpp
View File

@ -27,7 +27,7 @@ struct insert_test_base : public test::exception_base
return T(); 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); std::string scope(test::scope);
if(scope.find("hash::operator()") == std::string::npos) if(scope.find("hash::operator()") == std::string::npos)
@ -92,7 +92,7 @@ struct insert_test3 : public insert_test_base<T>
x.insert(this->values.begin(), this->values.end()); 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); test::check_equivalent_keys(x);
} }
}; };
@ -215,7 +215,7 @@ struct insert_test_rehash3 : public insert_test_base<T>
BOOST_TEST(x.bucket_count() != bucket_count); 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) { if(x.size() < rehash_bucket_count) {
//BOOST_TEST(x.bucket_count() == original_bucket_count); //BOOST_TEST(x.bucket_count() == original_bucket_count);
} }

4
test/exception/rehash_exception_tests.cpp
View File

@ -28,7 +28,9 @@ struct rehash_test_base : public test::exception_base
return x; 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); std::string scope(test::scope);
if(scope.find("hash::operator()") == std::string::npos && if(scope.find("hash::operator()") == std::string::npos &&

4
test/exception/swap_exception_tests.cpp
View File

@ -22,7 +22,7 @@ struct self_swap_base : public test::exception_base
typedef T data_type; typedef T data_type;
T init() const { return T(values.begin(), values.end()); } T init() const { return T(values.begin(), values.end()); }
void run(T& x) const { x.swap(x); } 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); std::string scope(test::scope);
#if BOOST_UNORDERED_SWAP_METHOD != 2 #if BOOST_UNORDERED_SWAP_METHOD != 2
@ -77,7 +77,7 @@ struct swap_base : public test::exception_base
d.x.swap(d.y); d.x.swap(d.y);
} catch (std::runtime_error) {} } 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); std::string scope(test::scope);
#if BOOST_UNORDERED_SWAP_METHOD != 2 #if BOOST_UNORDERED_SWAP_METHOD != 2

2
test/helpers/exception_test.hpp
View File

@ -110,7 +110,7 @@ namespace test {
template <class T> void test(T const&) const {} template <class T> void test(T const&) const {}
}; };
data_type init() const { return data_type(); } 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> template <class T, class P1, class P2, class T2>

2
test/unordered/incomplete_test.cpp
View File

@ -36,4 +36,4 @@ int main() {
m2.insert(std::make_pair(test::value(), test::value())); m2.insert(std::make_pair(test::value(), test::value()));
s1.insert(test::value()); s1.insert(test::value());
s2.insert(test::value()); s2.insert(test::value());
} }