forked from boostorg/config
merged changes from main branch
[SVN r21564]
This commit is contained in:
@@ -30,13 +30,13 @@ namespace boost
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace user
|
namespace user_ns
|
||||||
{
|
{
|
||||||
template <class T>
|
template <class T>
|
||||||
struct Y{};
|
struct Y{};
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
T* get_pointer(user::Y<T>)
|
T* get_pointer(user_ns::Y<T>)
|
||||||
{ return 0; }
|
{ return 0; }
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
@@ -58,8 +58,8 @@ int test()
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
typedef void* pv;
|
typedef void* pv;
|
||||||
i = user::f(pv());
|
i = user_ns::f(pv());
|
||||||
i = user::f(boost::inner2::X<int>());
|
i = user_ns::f(boost::inner2::X<int>());
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -7,6 +7,32 @@ dll link_test : link_test.cpp
|
|||||||
<runtime-link>dynamic
|
<runtime-link>dynamic
|
||||||
<define>BOOST_DYN_LINK=1
|
<define>BOOST_DYN_LINK=1
|
||||||
<sysinclude>$(BOOST_ROOT)
|
<sysinclude>$(BOOST_ROOT)
|
||||||
|
# make sure the names of the libraries are correctly named:
|
||||||
|
common-variant-tag
|
||||||
:
|
:
|
||||||
debug release
|
debug release
|
||||||
;
|
;
|
||||||
|
|
||||||
|
lib link_test : link_test.cpp
|
||||||
|
:
|
||||||
|
<sysinclude>$(BOOST_ROOT)
|
||||||
|
# make sure the names of the libraries are correctly named:
|
||||||
|
common-variant-tag
|
||||||
|
:
|
||||||
|
debug release
|
||||||
|
;
|
||||||
|
|
||||||
|
stage stage/lib : <lib>link_test <dll>link_test
|
||||||
|
:
|
||||||
|
# copy to a path rooted at BOOST_ROOT:
|
||||||
|
<locate>$(BOOST_ROOT)
|
||||||
|
# make sure the names of the libraries are correctly named:
|
||||||
|
common-variant-tag
|
||||||
|
# add this target to the "stage" and "all" psuedo-targets:
|
||||||
|
<target>stage
|
||||||
|
<target>all
|
||||||
|
:
|
||||||
|
debug release
|
||||||
|
;
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user