commit 20f85b510f87416034182b4fab01b493a0573c8b Author: Tim Blechmann Date: Sat Jun 30 09:33:46 2012 +0200 thread/exception: specify namespace for enable/disable_if Signed-off-by: Tim Blechmann 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 inline - typename enable_if,std::string>::type + typename boost::enable_if,std::string>::type to_string( error_info const & x ) { return to_string(x.value()); @@ -186,7 +186,7 @@ boost template inline - typename enable_if,E const &>::type + typename boost::enable_if,E const &>::type operator<<( E const & x, error_info 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 - typename disable_if,char>::type to_string( T const & ); + typename boost::disable_if,char>::type to_string( T const & ); template struct has_to_string_impl; @@ -46,7 +46,7 @@ boost template inline - typename enable_if,std::string>::type + typename boost::enable_if,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 eb21107..997406b 100644 --- a/boost/thread/detail/move.hpp +++ b/boost/thread/detail/move.hpp @@ -41,7 +41,7 @@ namespace boost #ifndef BOOST_NO_SFINAE template - typename enable_if >, detail::thread_move_t >::type move(T& t) + typename boost::enable_if >, detail::thread_move_t >::type move(T& t) { return detail::thread_move_t(t); } diff --git a/boost/thread/detail/thread.hpp b/boost/thread/detail/thread.hpp index 7863c2f..a51562c 100644 --- a/boost/thread/detail/thread.hpp +++ b/boost/thread/detail/thread.hpp @@ -198,7 +198,7 @@ namespace boost } #else template - explicit thread(F f,typename disable_if >, dummy* >::type=0): + explicit thread(F f,typename boost::disable_if >, dummy* >::type=0): thread_info(make_thread_info(f)) { start_thread();