From b130802a6ee0ef79c31bb7351d4fae437abb5a08 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sun, 12 Apr 2009 15:59:12 +0000
Subject: [PATCH] Change test so we don't get namespace clashes with the real
 Boost code, updated all/Jamfile.v2 so it actually works now!

[SVN r52354]
---
 test/all/Jamfile.v2                | 4 ++++
 test/boost_no_using_breaks_adl.ipp | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/all/Jamfile.v2 b/test/all/Jamfile.v2
index 41477cae..e30b5fe2 100644
--- a/test/all/Jamfile.v2
+++ b/test/all/Jamfile.v2
@@ -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 ;
diff --git a/test/boost_no_using_breaks_adl.ipp b/test/boost_no_using_breaks_adl.ipp
index fbf6e411..437d9fdc 100644
--- a/test/boost_no_using_breaks_adl.ipp
+++ b/test/boost_no_using_breaks_adl.ipp
@@ -13,7 +13,7 @@
 //                 using whatever::symbol;.
 
 
-namespace boost
+namespace boost_ns
 {
    template <class T>
    T* get_pointer(T* p)
@@ -45,7 +45,7 @@ namespace user_ns
       // 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 test()
    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;
 }