|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r63739 - in branches/release/boost/type_traits: . msvc
From: john_at_[hidden]
Date: 2010-07-08 06:28:01
Author: johnmaddock
Date: 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
New Revision: 63739
URL: http://svn.boost.org/trac/boost/changeset/63739
Log:
Make all references to the detail:: namespace fully qualified so we don't get ambiguities with other libraries.
Fixes #4407.
Text files modified:
branches/release/boost/type_traits/function_traits.hpp | 4 ++--
branches/release/boost/type_traits/is_complex.hpp | 2 +-
branches/release/boost/type_traits/is_const.hpp | 4 ++--
branches/release/boost/type_traits/is_convertible.hpp | 2 +-
branches/release/boost/type_traits/is_same.hpp | 4 ++--
branches/release/boost/type_traits/is_volatile.hpp | 4 ++--
branches/release/boost/type_traits/msvc/remove_all_extents.hpp | 2 +-
branches/release/boost/type_traits/msvc/remove_bounds.hpp | 2 +-
branches/release/boost/type_traits/msvc/remove_const.hpp | 2 +-
branches/release/boost/type_traits/msvc/remove_cv.hpp | 2 +-
branches/release/boost/type_traits/msvc/remove_extent.hpp | 2 +-
branches/release/boost/type_traits/msvc/remove_pointer.hpp | 2 +-
branches/release/boost/type_traits/msvc/remove_reference.hpp | 2 +-
branches/release/boost/type_traits/msvc/remove_volatile.hpp | 2 +-
branches/release/boost/type_traits/remove_cv.hpp | 2 +-
branches/release/boost/type_traits/remove_reference.hpp | 2 +-
branches/release/boost/type_traits/type_with_alignment.hpp | 20 ++++++++++----------
17 files changed, 30 insertions(+), 30 deletions(-)
Modified: branches/release/boost/type_traits/function_traits.hpp
==============================================================================
--- branches/release/boost/type_traits/function_traits.hpp (original)
+++ branches/release/boost/type_traits/function_traits.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -166,7 +166,7 @@
template<typename Function>
struct function_traits :
- public detail::function_traits_helper<typename boost::add_pointer<Function>::type>
+ public boost::detail::function_traits_helper<typename boost::add_pointer<Function>::type>
{
};
@@ -227,7 +227,7 @@
template<typename Function>
struct function_traits
{
- BOOST_STATIC_CONSTANT(unsigned, arity = (sizeof(detail::function_arity_helper((Function*)0))-1));
+ BOOST_STATIC_CONSTANT(unsigned, arity = (sizeof(boost::detail::function_arity_helper((Function*)0))-1));
};
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
Modified: branches/release/boost/type_traits/is_complex.hpp
==============================================================================
--- branches/release/boost/type_traits/is_complex.hpp (original)
+++ branches/release/boost/type_traits/is_complex.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -25,7 +25,7 @@
}
-BOOST_TT_AUX_BOOL_TRAIT_DEF1(is_complex,T,(::boost::is_convertible<T, detail::is_convertible_from_tester>::value))
+BOOST_TT_AUX_BOOL_TRAIT_DEF1(is_complex,T,(::boost::is_convertible<T, boost::detail::is_convertible_from_tester>::value))
} // namespace boost
Modified: branches/release/boost/type_traits/is_const.hpp
==============================================================================
--- branches/release/boost/type_traits/is_const.hpp (original)
+++ branches/release/boost/type_traits/is_const.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -117,7 +117,7 @@
{
static T* t;
BOOST_STATIC_CONSTANT(bool, value = (
- sizeof(detail::yes_type) == sizeof(detail::is_const_tester(t))
+ sizeof(boost::detail::yes_type) == sizeof(boost::detail::is_const_tester(t))
));
};
};
@@ -129,7 +129,7 @@
{
static T t;
BOOST_STATIC_CONSTANT(bool, value = (
- sizeof(detail::yes_type) == sizeof(detail::is_const_tester(&t))
+ sizeof(boost::detail::yes_type) == sizeof(boost::detail::is_const_tester(&t))
));
};
};
Modified: branches/release/boost/type_traits/is_convertible.hpp
==============================================================================
--- branches/release/boost/type_traits/is_convertible.hpp (original)
+++ branches/release/boost/type_traits/is_convertible.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -132,7 +132,7 @@
struct is_convertible_basic_impl
{
static From _m_from;
- static bool const value = sizeof( detail::checker<To>::_m_check(_m_from, 0) )
+ static bool const value = sizeof( boost::detail::checker<To>::_m_check(_m_from, 0) )
== sizeof(::boost::type_traits::yes_type);
};
Modified: branches/release/boost/type_traits/is_same.hpp
==============================================================================
--- branches/release/boost/type_traits/is_same.hpp (original)
+++ branches/release/boost/type_traits/is_same.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -61,7 +61,7 @@
template< typename T1, typename T2 >
struct is_same_impl
{
- enum { value = detail::is_same_part_1<T1>::template part_2<T2>::value };
+ enum { value = boost::detail::is_same_part_1<T1>::template part_2<T2>::value };
};
#else // generic "no-partial-specialization" version
@@ -81,7 +81,7 @@
BOOST_STATIC_CONSTANT(bool, value =
(::boost::type_traits::ice_and<
- (sizeof(type_traits::yes_type) == sizeof(detail::is_same_tester(&t,&u))),
+ (sizeof(type_traits::yes_type) == sizeof(boost::detail::is_same_tester(&t,&u))),
(::boost::is_reference<T>::value == ::boost::is_reference<U>::value),
(sizeof(T) == sizeof(U))
>::value));
Modified: branches/release/boost/type_traits/is_volatile.hpp
==============================================================================
--- branches/release/boost/type_traits/is_volatile.hpp (original)
+++ branches/release/boost/type_traits/is_volatile.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -105,7 +105,7 @@
{
static T* t;
BOOST_STATIC_CONSTANT(bool, value = (
- sizeof(detail::yes_type) == sizeof(detail::is_volatile_tester(t))
+ sizeof(boost::detail::yes_type) == sizeof(boost::detail::is_volatile_tester(t))
));
};
};
@@ -117,7 +117,7 @@
{
static T t;
BOOST_STATIC_CONSTANT(bool, value = (
- sizeof(detail::yes_type) == sizeof(detail::is_volatile_tester(&t))
+ sizeof(boost::detail::yes_type) == sizeof(boost::detail::is_volatile_tester(&t))
));
};
};
Modified: branches/release/boost/type_traits/msvc/remove_all_extents.hpp
==============================================================================
--- branches/release/boost/type_traits/msvc/remove_all_extents.hpp (original)
+++ branches/release/boost/type_traits/msvc/remove_all_extents.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -36,7 +36,7 @@
template<typename T>
struct remove_all_extents {
- typedef typename detail::remove_all_extents_impl_typeof<
+ typedef typename boost::detail::remove_all_extents_impl_typeof<
boost::is_array<T>::value
>::template inner<T,remove_all_extents<T> >::type type;
BOOST_MPL_AUX_LAMBDA_SUPPORT(1,remove_all_extents,T)
Modified: branches/release/boost/type_traits/msvc/remove_bounds.hpp
==============================================================================
--- branches/release/boost/type_traits/msvc/remove_bounds.hpp (original)
+++ branches/release/boost/type_traits/msvc/remove_bounds.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -32,7 +32,7 @@
template<typename T>
struct remove_bounds {
- typedef typename detail::remove_bounds_impl_typeof<
+ typedef typename boost::detail::remove_bounds_impl_typeof<
boost::is_array<T>::value
>::template inner<T,remove_bounds<T> >::type type;
BOOST_MPL_AUX_LAMBDA_SUPPORT(1,remove_bounds,T)
Modified: branches/release/boost/type_traits/msvc/remove_const.hpp
==============================================================================
--- branches/release/boost/type_traits/msvc/remove_const.hpp (original)
+++ branches/release/boost/type_traits/msvc/remove_const.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -124,7 +124,7 @@
template<typename T>
struct remove_const {
- typedef detail::remove_const_impl_typeof<
+ typedef boost::detail::remove_const_impl_typeof<
boost::is_pointer<T>::value,
boost::is_array<T>::value,
boost::is_const<T>::value,
Modified: branches/release/boost/type_traits/msvc/remove_cv.hpp
==============================================================================
--- branches/release/boost/type_traits/msvc/remove_cv.hpp (original)
+++ branches/release/boost/type_traits/msvc/remove_cv.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -171,7 +171,7 @@
template<typename T>
struct remove_cv {
- typedef detail::remove_cv_impl_typeof<
+ typedef boost::detail::remove_cv_impl_typeof<
boost::is_pointer<T>::value,
boost::is_array<T>::value,
boost::is_const<T>::value,
Modified: branches/release/boost/type_traits/msvc/remove_extent.hpp
==============================================================================
--- branches/release/boost/type_traits/msvc/remove_extent.hpp (original)
+++ branches/release/boost/type_traits/msvc/remove_extent.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -32,7 +32,7 @@
template<typename T>
struct remove_extent {
- typedef typename detail::remove_extent_impl_typeof<
+ typedef typename boost::detail::remove_extent_impl_typeof<
boost::is_array<T>::value
>::template inner<T,remove_extent<T> >::type type;
BOOST_MPL_AUX_LAMBDA_SUPPORT(1,remove_extent,T)
Modified: branches/release/boost/type_traits/msvc/remove_pointer.hpp
==============================================================================
--- branches/release/boost/type_traits/msvc/remove_pointer.hpp (original)
+++ branches/release/boost/type_traits/msvc/remove_pointer.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -32,7 +32,7 @@
template<typename T>
struct remove_pointer {
- typedef typename detail::remove_pointer_impl_typeof<
+ typedef typename boost::detail::remove_pointer_impl_typeof<
boost::is_pointer<T>::value
>::template inner<T,remove_pointer<T> >::type type;
BOOST_MPL_AUX_LAMBDA_SUPPORT(1,remove_pointer,T)
Modified: branches/release/boost/type_traits/msvc/remove_reference.hpp
==============================================================================
--- branches/release/boost/type_traits/msvc/remove_reference.hpp (original)
+++ branches/release/boost/type_traits/msvc/remove_reference.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -32,7 +32,7 @@
template<typename T>
struct remove_reference {
- typedef typename detail::remove_reference_impl_typeof<
+ typedef typename boost::detail::remove_reference_impl_typeof<
boost::is_reference<T>::value
>::template inner<T,remove_reference<T> >::type type;
BOOST_MPL_AUX_LAMBDA_SUPPORT(1,remove_reference,T)
Modified: branches/release/boost/type_traits/msvc/remove_volatile.hpp
==============================================================================
--- branches/release/boost/type_traits/msvc/remove_volatile.hpp (original)
+++ branches/release/boost/type_traits/msvc/remove_volatile.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -124,7 +124,7 @@
template<typename T>
struct remove_volatile {
- typedef detail::remove_volatile_impl_typeof<
+ typedef boost::detail::remove_volatile_impl_typeof<
boost::is_pointer<T>::value,
boost::is_array<T>::value,
boost::is_const<T>::value,
Modified: branches/release/boost/type_traits/remove_cv.hpp
==============================================================================
--- branches/release/boost/type_traits/remove_cv.hpp (original)
+++ branches/release/boost/type_traits/remove_cv.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -52,7 +52,7 @@
#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
// convert a type T to a non-cv-qualified type - remove_cv<T>
-BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_cv,T,typename detail::rvalue_ref_filter_rem_cv<T>::type)
+BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_cv,T,typename boost::detail::rvalue_ref_filter_rem_cv<T>::type)
BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_1(typename T,remove_cv,T&,T&)
#if !defined(BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS)
BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_2(typename T,std::size_t N,remove_cv,T const[N],T type[N])
Modified: branches/release/boost/type_traits/remove_reference.hpp
==============================================================================
--- branches/release/boost/type_traits/remove_reference.hpp (original)
+++ branches/release/boost/type_traits/remove_reference.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -44,7 +44,7 @@
} // namespace detail
-BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_reference,T,typename detail::remove_rvalue_ref<T>::type)
+BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_reference,T,typename boost::detail::remove_rvalue_ref<T>::type)
BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_1(typename T,remove_reference,T&,T)
#if defined(BOOST_ILLEGAL_CV_REFERENCES)
Modified: branches/release/boost/type_traits/type_with_alignment.hpp
==============================================================================
--- branches/release/boost/type_traits/type_with_alignment.hpp (original)
+++ branches/release/boost/type_traits/type_with_alignment.hpp 2010-07-08 06:27:58 EDT (Thu, 08 Jul 2010)
@@ -286,43 +286,43 @@
template<> class type_with_alignment<8>
{
typedef mpl::if_c<
- ::boost::alignment_of<detail::max_align>::value < 8,
+ ::boost::alignment_of<boost::detail::max_align>::value < 8,
align::a8,
- detail::type_with_alignment_imp<8> >::type t1;
+ boost::detail::type_with_alignment_imp<8> >::type t1;
public:
typedef t1::type type;
};
template<> class type_with_alignment<16>
{
typedef mpl::if_c<
- ::boost::alignment_of<detail::max_align>::value < 16,
+ ::boost::alignment_of<boost::detail::max_align>::value < 16,
align::a16,
- detail::type_with_alignment_imp<16> >::type t1;
+ boost::detail::type_with_alignment_imp<16> >::type t1;
public:
typedef t1::type type;
};
template<> class type_with_alignment<32>
{
typedef mpl::if_c<
- ::boost::alignment_of<detail::max_align>::value < 32,
+ ::boost::alignment_of<boost::detail::max_align>::value < 32,
align::a32,
- detail::type_with_alignment_imp<32> >::type t1;
+ boost::detail::type_with_alignment_imp<32> >::type t1;
public:
typedef t1::type type;
};
template<> class type_with_alignment<64> {
typedef mpl::if_c<
- ::boost::alignment_of<detail::max_align>::value < 64,
+ ::boost::alignment_of<boost::detail::max_align>::value < 64,
align::a64,
- detail::type_with_alignment_imp<64> >::type t1;
+ boost::detail::type_with_alignment_imp<64> >::type t1;
public:
typedef t1::type type;
};
template<> class type_with_alignment<128> {
typedef mpl::if_c<
- ::boost::alignment_of<detail::max_align>::value < 128,
+ ::boost::alignment_of<boost::detail::max_align>::value < 128,
align::a128,
- detail::type_with_alignment_imp<128> >::type t1;
+ boost::detail::type_with_alignment_imp<128> >::type t1;
public:
typedef t1::type type;
};
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