>From d91f653e689fdb33dbd0f7a17b6d0f123427cf39 Mon Sep 17 00:00:00 2001
Message-Id: <d91f653e689fdb33dbd0f7a17b6d0f123427cf39.1341050882.git.tim@klingt.org>
From: Tim Blechmann <tim@klingt.org>
Date: Sat, 30 Jun 2012 12:08:00 +0200
Subject: [PATCH] exception/thread/typeof: use specify namespace for
 enable_if/disable_if

Signed-off-by: Tim Blechmann <tim@klingt.org>
---
 boost/exception/info.hpp       |    4 ++--
 boost/exception/to_string.hpp  |    4 ++--
 boost/thread/detail/move.hpp   |    2 +-
 boost/thread/detail/thread.hpp |    8 ++++----
 boost/typeof/native.hpp        |    4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/boost/exception/info.hpp b/boost/exception/info.hpp
index 7b56076..ced351a 100644
--- a/boost/exception/info.hpp
+++ b/boost/exception/info.hpp
@@ -24,7 +24,7 @@ boost
     {
     template <class Tag,class T>
     inline
-    typename enable_if<has_to_string<T>,std::string>::type
+    typename boost::enable_if<has_to_string<T>,std::string>::type
     to_string( error_info<Tag,T> const & x )
         {
         return to_string(x.value());
@@ -186,7 +186,7 @@ boost
 
     template <class E,class Tag,class T>
     inline
-    typename enable_if<exception_detail::derives_boost_exception<E>,E const &>::type
+    typename boost::enable_if<exception_detail::derives_boost_exception<E>,E const &>::type
     operator<<( E const & x, error_info<Tag,T> const & v )
         {
         return exception_detail::set_info(x,v);
diff --git a/boost/exception/to_string.hpp b/boost/exception/to_string.hpp
index 59bf83d..bbac3dc 100644
--- a/boost/exception/to_string.hpp
+++ b/boost/exception/to_string.hpp
@@ -23,7 +23,7 @@ boost
     to_string_detail
         {
         template <class T>
-        typename disable_if<is_output_streamable<T>,char>::type to_string( T const & );
+        typename boost::disable_if<is_output_streamable<T>,char>::type to_string( T const & );
 
         template <class,bool IsOutputStreamable>
         struct has_to_string_impl;
@@ -46,7 +46,7 @@ boost
 
     template <class T>
     inline
-    typename enable_if<is_output_streamable<T>,std::string>::type
+    typename boost::enable_if<is_output_streamable<T>,std::string>::type
     to_string( T const & x )
         {
         std::ostringstream out;
diff --git a/boost/thread/detail/move.hpp b/boost/thread/detail/move.hpp
index 748b8dc..fbc50bf 100644
--- a/boost/thread/detail/move.hpp
+++ b/boost/thread/detail/move.hpp
@@ -52,7 +52,7 @@ namespace boost
 
 #ifndef BOOST_NO_SFINAE
     template<typename T>
-    typename enable_if<boost::is_convertible<T&,boost::detail::thread_move_t<T> >, boost::detail::thread_move_t<T> >::type move(T& t)
+    typename boost::enable_if<boost::is_convertible<T&,boost::detail::thread_move_t<T> >, boost::detail::thread_move_t<T> >::type move(T& t)
     {
         return boost::detail::thread_move_t<T>(t);
     }
diff --git a/boost/thread/detail/thread.hpp b/boost/thread/detail/thread.hpp
index bc20227..e932ca9 100644
--- a/boost/thread/detail/thread.hpp
+++ b/boost/thread/detail/thread.hpp
@@ -212,14 +212,14 @@ namespace boost
         template <class F>
         explicit thread(F f
             // todo Disable also if Or is_same<typename decay<F>::type, thread>
-        , typename disable_if<boost::is_convertible<F&,BOOST_THREAD_RV_REF(F) >, dummy* >::type=0):
+        , typename boost::disable_if<boost::is_convertible<F&,BOOST_THREAD_RV_REF(F) >, dummy* >::type=0):
             thread_info(make_thread_info(f))
         {
             start_thread();
         }
         template <class F>
         thread(attributes& attrs, F f
-        , typename disable_if<boost::is_convertible<F&,BOOST_THREAD_RV_REF(F) >, dummy* >::type=0):
+        , typename boost::disable_if<boost::is_convertible<F&,BOOST_THREAD_RV_REF(F) >, dummy* >::type=0):
             thread_info(make_thread_info(f))
         {
             start_thread(attrs);
@@ -227,7 +227,7 @@ namespace boost
 #endif
         template <class F>
         explicit thread(BOOST_THREAD_RV_REF(F) f
-        , typename disable_if<is_same<typename decay<F>::type, thread>, dummy* >::type=0
+        , typename boost::disable_if<is_same<typename decay<F>::type, thread>, dummy* >::type=0
         ):
             thread_info(make_thread_info(f))
         {
@@ -268,7 +268,7 @@ namespace boost
         }
 
         template <class F,class A1>
-        thread(F f,A1 a1,typename disable_if<boost::is_convertible<F&,thread_attributes >, dummy* >::type=0):
+        thread(F f,A1 a1,typename boost::disable_if<boost::is_convertible<F&,thread_attributes >, dummy* >::type=0):
             thread_info(make_thread_info(boost::bind(boost::type<void>(),f,a1)))
         {
             start_thread();
diff --git a/boost/typeof/native.hpp b/boost/typeof/native.hpp
index 8197e28..c108fb8 100644
--- a/boost/typeof/native.hpp
+++ b/boost/typeof/native.hpp
@@ -27,11 +27,11 @@ namespace boost { namespace type_of {
     T& ensure_obj(const T&);
 # else
     template<typename T>
-        typename enable_if<is_function<T>, T&>::type
+        typename boost::enable_if<is_function<T>, T&>::type
         ensure_obj(T&);
 
     template<typename T>
-        typename disable_if<is_function<T>, T&>::type
+        typename boost::disable_if<is_function<T>, T&>::type
         ensure_obj(const T&);
 # endif
 }}
-- 
1.7.9.5