[Boost-commit] svn:boost r52354 - in trunk/libs/config/test: . all

Subject: [Boost-commit] svn:boost r52354 - in trunk/libs/config/test: . all
From: john_at_[hidden]
Date: 2009-04-12 11:59:13

Author: johnmaddock
Date: 2009-04-12 11:59:12 EDT (Sun, 12 Apr 2009)
New Revision: 52354
URL: http://svn.boost.org/trac/boost/changeset/52354

Log:
Change test so we don't get namespace clashes with the real Boost code, updated all/Jamfile.v2 so it actually works now!
Text files modified: 
   trunk/libs/config/test/all/Jamfile.v2                |     4 ++++                                    
   trunk/libs/config/test/boost_no_using_breaks_adl.ipp |     6 +++---                                  
   2 files changed, 7 insertions(+), 3 deletions(-)

Modified: trunk/libs/config/test/all/Jamfile.v2
==============================================================================
--- trunk/libs/config/test/all/Jamfile.v2	(original)
+++ trunk/libs/config/test/all/Jamfile.v2	2009-04-12 11:59:12 EDT (Sun, 12 Apr 2009)
@@ -14,6 +14,10 @@
 path-constant DOT : . ;
 include $(DOT)/options_v2.jam ;
 
+project  
+    : requirements 
+	<include>.. ;
+
 run ../config_info.cpp  : : : <threading>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static ;
 run ../config_info.cpp  : : : <threading>multi : config_info_threaded ;
 run ../math_info.cpp : : : <toolset>borland:<runtime-link>static <toolset>borland:<link>static ;

Modified: trunk/libs/config/test/boost_no_using_breaks_adl.ipp
==============================================================================
--- trunk/libs/config/test/boost_no_using_breaks_adl.ipp	(original)
+++ trunk/libs/config/test/boost_no_using_breaks_adl.ipp	2009-04-12 11:59:12 EDT (Sun, 12 Apr 2009)
@@ -13,7 +13,7 @@
 //                 using whatever::symbol;.
 
 
-namespace boost
+namespace boost_ns
 {
    template <class T>
    T* get_pointer(T* p)
@@ -45,7 +45,7 @@
       // use this as a workaround:
       //using namespace boost;
       // this statement breaks ADL:
-      using boost::get_pointer;    // conforming compilers require
+      using boost_ns::get_pointer;    // conforming compilers require
                                    // this one to find the auto_ptr
                                    // and T* overloads
       return get_pointer(x) == 0;
@@ -59,7 +59,7 @@
    int i;
    typedef void* pv;
    i = user_ns::f(pv());
-   i = user_ns::f(boost::inner2::X<int>());
+   i = user_ns::f(boost_ns::inner2::X<int>());
    return 0;
 }