Boost logo

Boost-Commit :

From: daniel_james_at_[hidden]
Date: 2008-01-10 07:55:06


Author: danieljames
Date: 2008-01-10 07:55:06 EST (Thu, 10 Jan 2008)
New Revision: 42656
URL: http://svn.boost.org/trac/boost/changeset/42656

Log:
Put the custom class in a namespace because borland has a problem with ADL in the global namespace.
Text files modified:
   branches/unordered/trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp | 69 ++++++++++++++++++++-------------------
   1 files changed, 35 insertions(+), 34 deletions(-)

Modified: branches/unordered/trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp
==============================================================================
--- branches/unordered/trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp (original)
+++ branches/unordered/trunk/libs/unordered/test/unordered/unnecessary_copy_tests.cpp 2008-01-10 07:55:06 EST (Thu, 10 Jan 2008)
@@ -7,51 +7,52 @@
 #include <boost/unordered_map.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-struct count_copies
-{
- static int count;
- count_copies() { ++count; }
- count_copies(count_copies const&) { ++count; }
-private:
- count_copies& operator=(count_copies const&);
-};
-
-#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
-namespace boost {
-#endif
-
-std::size_t hash_value(count_copies const&) {
- return 0;
+namespace test {
+ struct count_copies
+ {
+ static int count;
+ count_copies() { ++count; }
+ count_copies(count_copies const&) { ++count; }
+ private:
+ count_copies& operator=(count_copies const&);
+ };
+
+ bool operator==(test::count_copies const&, test::count_copies const&) {
+ return true;
+ }
 }
 
 #if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
-}
+namespace boost {
+#else
+namespace test {
 #endif
-
-bool operator==(count_copies const&, count_copies const&) {
- return true;
+ std::size_t hash_value(count_copies const&) {
+ return 0;
+ }
 }
 
-int count_copies::count;
+namespace test {
+ int count_copies::count;
 
-template <class T>
-void unnecessary_copy_test(T*)
-{
- count_copies::count = 0;
- T x;
- typename T::value_type a;
- BOOST_TEST(count_copies::count == 1);
- x.insert(a);
- BOOST_TEST(count_copies::count == 2);
+ template <class T>
+ void unnecessary_copy_test(T*)
+ {
+ count_copies::count = 0;
+ T x;
+ typename T::value_type a;
+ BOOST_TEST(count_copies::count == 1);
+ x.insert(a);
+ BOOST_TEST(count_copies::count == 2);
+ }
 }
 
-
 int main()
 {
- unnecessary_copy_test((boost::unordered_set<count_copies>*) 0);
- unnecessary_copy_test((boost::unordered_multiset<count_copies>*) 0);
- unnecessary_copy_test((boost::unordered_map<int, count_copies>*) 0);
- unnecessary_copy_test((boost::unordered_multimap<int, count_copies>*) 0);
+ test::unnecessary_copy_test((boost::unordered_set<test::count_copies>*) 0);
+ test::unnecessary_copy_test((boost::unordered_multiset<test::count_copies>*) 0);
+ test::unnecessary_copy_test((boost::unordered_map<int, test::count_copies>*) 0);
+ test::unnecessary_copy_test((boost::unordered_multimap<int, test::count_copies>*) 0);
 
     return boost::report_errors();
 }


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk