From 4bef4e5708a9a32ca09882893662a1522a4c6b91 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Thu, 8 Jul 2010 10:27:58 +0000
Subject: [PATCH] Make all references to the detail:: namespace fully qualified
 so we don't get ambiguities with other libraries. Fixes #4407.

[SVN r63739]
---
 include/boost/type_traits/function_traits.hpp |  4 ++--
 include/boost/type_traits/is_complex.hpp      |  2 +-
 include/boost/type_traits/is_const.hpp        |  4 ++--
 include/boost/type_traits/is_convertible.hpp  |  2 +-
 include/boost/type_traits/is_same.hpp         |  4 ++--
 include/boost/type_traits/is_volatile.hpp     |  4 ++--
 .../type_traits/msvc/remove_all_extents.hpp   |  2 +-
 .../boost/type_traits/msvc/remove_bounds.hpp  |  2 +-
 .../boost/type_traits/msvc/remove_const.hpp   |  2 +-
 include/boost/type_traits/msvc/remove_cv.hpp  |  2 +-
 .../boost/type_traits/msvc/remove_extent.hpp  |  2 +-
 .../boost/type_traits/msvc/remove_pointer.hpp |  2 +-
 .../type_traits/msvc/remove_reference.hpp     |  2 +-
 .../type_traits/msvc/remove_volatile.hpp      |  2 +-
 include/boost/type_traits/remove_cv.hpp       |  2 +-
 .../boost/type_traits/remove_reference.hpp    |  2 +-
 .../boost/type_traits/type_with_alignment.hpp | 20 +++++++++----------
 17 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/include/boost/type_traits/function_traits.hpp b/include/boost/type_traits/function_traits.hpp
index bfc3f7e..6d708cd 100644
--- a/include/boost/type_traits/function_traits.hpp
+++ b/include/boost/type_traits/function_traits.hpp
@@ -166,7 +166,7 @@ struct function_traits_helper<R (*)(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10)>
 
 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 @@ type_of_size<11> function_arity_helper(R (*f)(T1, T2, T3, T4, T5, T6, T7, T8,
 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
diff --git a/include/boost/type_traits/is_complex.hpp b/include/boost/type_traits/is_complex.hpp
index 9ccc333..0813dac 100644
--- a/include/boost/type_traits/is_complex.hpp
+++ b/include/boost/type_traits/is_complex.hpp
@@ -25,7 +25,7 @@ struct is_convertible_from_tester
 
 }
 
-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
 
diff --git a/include/boost/type_traits/is_const.hpp b/include/boost/type_traits/is_const.hpp
index 6b848f2..812ed15 100644
--- a/include/boost/type_traits/is_const.hpp
+++ b/include/boost/type_traits/is_const.hpp
@@ -117,7 +117,7 @@ struct is_const_helper<false,false>
     {
         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 @@ struct is_const_helper<false,true>
     {
         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))
             ));
     };
 };
diff --git a/include/boost/type_traits/is_convertible.hpp b/include/boost/type_traits/is_convertible.hpp
index a31a930..c05c297 100644
--- a/include/boost/type_traits/is_convertible.hpp
+++ b/include/boost/type_traits/is_convertible.hpp
@@ -132,7 +132,7 @@ template <typename From, typename To>
 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);
 };
 
diff --git a/include/boost/type_traits/is_same.hpp b/include/boost/type_traits/is_same.hpp
index e0d1808..c6afbd7 100644
--- a/include/boost/type_traits/is_same.hpp
+++ b/include/boost/type_traits/is_same.hpp
@@ -61,7 +61,7 @@ struct is_same_part_1
 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 @@ struct is_same_impl
 
    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));
diff --git a/include/boost/type_traits/is_volatile.hpp b/include/boost/type_traits/is_volatile.hpp
index 677502b..e531263 100644
--- a/include/boost/type_traits/is_volatile.hpp
+++ b/include/boost/type_traits/is_volatile.hpp
@@ -105,7 +105,7 @@ struct is_volatile_helper<false,false>
     {
         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 @@ struct is_volatile_helper<false,true>
     {
         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))
             ));
     };
 };
diff --git a/include/boost/type_traits/msvc/remove_all_extents.hpp b/include/boost/type_traits/msvc/remove_all_extents.hpp
index 3517132..25c0edf 100644
--- a/include/boost/type_traits/msvc/remove_all_extents.hpp
+++ b/include/boost/type_traits/msvc/remove_all_extents.hpp
@@ -36,7 +36,7 @@ namespace boost {
 
     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)
diff --git a/include/boost/type_traits/msvc/remove_bounds.hpp b/include/boost/type_traits/msvc/remove_bounds.hpp
index 12a9b05..4b23b35 100644
--- a/include/boost/type_traits/msvc/remove_bounds.hpp
+++ b/include/boost/type_traits/msvc/remove_bounds.hpp
@@ -32,7 +32,7 @@ namespace boost {
 
     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)
diff --git a/include/boost/type_traits/msvc/remove_const.hpp b/include/boost/type_traits/msvc/remove_const.hpp
index 5395e80..d370754 100644
--- a/include/boost/type_traits/msvc/remove_const.hpp
+++ b/include/boost/type_traits/msvc/remove_const.hpp
@@ -124,7 +124,7 @@ namespace boost {
 
     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,
diff --git a/include/boost/type_traits/msvc/remove_cv.hpp b/include/boost/type_traits/msvc/remove_cv.hpp
index c7b0379..9fbf8b8 100644
--- a/include/boost/type_traits/msvc/remove_cv.hpp
+++ b/include/boost/type_traits/msvc/remove_cv.hpp
@@ -171,7 +171,7 @@ namespace boost {
 
     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,
diff --git a/include/boost/type_traits/msvc/remove_extent.hpp b/include/boost/type_traits/msvc/remove_extent.hpp
index f87ec41..c5a59ef 100644
--- a/include/boost/type_traits/msvc/remove_extent.hpp
+++ b/include/boost/type_traits/msvc/remove_extent.hpp
@@ -32,7 +32,7 @@ namespace boost {
 
     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)
diff --git a/include/boost/type_traits/msvc/remove_pointer.hpp b/include/boost/type_traits/msvc/remove_pointer.hpp
index 8b9b0d4..ec847f9 100644
--- a/include/boost/type_traits/msvc/remove_pointer.hpp
+++ b/include/boost/type_traits/msvc/remove_pointer.hpp
@@ -32,7 +32,7 @@ namespace boost {
 
     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)
diff --git a/include/boost/type_traits/msvc/remove_reference.hpp b/include/boost/type_traits/msvc/remove_reference.hpp
index 367d352..f8a77d4 100644
--- a/include/boost/type_traits/msvc/remove_reference.hpp
+++ b/include/boost/type_traits/msvc/remove_reference.hpp
@@ -32,7 +32,7 @@ namespace boost {
     
     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)
diff --git a/include/boost/type_traits/msvc/remove_volatile.hpp b/include/boost/type_traits/msvc/remove_volatile.hpp
index 3759f2a..6f9259c 100644
--- a/include/boost/type_traits/msvc/remove_volatile.hpp
+++ b/include/boost/type_traits/msvc/remove_volatile.hpp
@@ -124,7 +124,7 @@ namespace boost {
 
     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,
diff --git a/include/boost/type_traits/remove_cv.hpp b/include/boost/type_traits/remove_cv.hpp
index 29ace77..668e755 100644
--- a/include/boost/type_traits/remove_cv.hpp
+++ b/include/boost/type_traits/remove_cv.hpp
@@ -52,7 +52,7 @@ struct rvalue_ref_filter_rem_cv<T&&>
 #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])
diff --git a/include/boost/type_traits/remove_reference.hpp b/include/boost/type_traits/remove_reference.hpp
index 110389b..a87db33 100644
--- a/include/boost/type_traits/remove_reference.hpp
+++ b/include/boost/type_traits/remove_reference.hpp
@@ -44,7 +44,7 @@ struct remove_rvalue_ref<T&&>
 
 } // 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)
diff --git a/include/boost/type_traits/type_with_alignment.hpp b/include/boost/type_traits/type_with_alignment.hpp
index d790ee1..ac31055 100644
--- a/include/boost/type_traits/type_with_alignment.hpp
+++ b/include/boost/type_traits/type_with_alignment.hpp
@@ -286,43 +286,43 @@ struct __declspec(align(128)) a128 {
 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;
 };