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]
This commit is contained in:
John Maddock
2009-04-12 15:59:12 +00:00
parent 340a8a3e65
commit b130802a6e
2 changed files with 7 additions and 3 deletions

View File

@ -14,6 +14,10 @@
path-constant DOT : . ; path-constant DOT : . ;
include $(DOT)/options_v2.jam ; 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>single <toolset>msvc:<runtime-link>static <toolset>msvc:<link>static ;
run ../config_info.cpp : : : <threading>multi : config_info_threaded ; run ../config_info.cpp : : : <threading>multi : config_info_threaded ;
run ../math_info.cpp : : : <toolset>borland:<runtime-link>static <toolset>borland:<link>static ; run ../math_info.cpp : : : <toolset>borland:<runtime-link>static <toolset>borland:<link>static ;

View File

@ -13,7 +13,7 @@
// using whatever::symbol;. // using whatever::symbol;.
namespace boost namespace boost_ns
{ {
template <class T> template <class T>
T* get_pointer(T* p) T* get_pointer(T* p)
@ -45,7 +45,7 @@ namespace user_ns
// use this as a workaround: // use this as a workaround:
//using namespace boost; //using namespace boost;
// this statement breaks ADL: // 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 // this one to find the auto_ptr
// and T* overloads // and T* overloads
return get_pointer(x) == 0; return get_pointer(x) == 0;
@ -59,7 +59,7 @@ int test()
int i; int i;
typedef void* pv; typedef void* pv;
i = user_ns::f(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; return 0;
} }