From edb81e828bb9adcf8fddb78b59730da3d3e40b9e Mon Sep 17 00:00:00 2001 From: Neil Groves Date: Mon, 10 Mar 2014 19:01:24 +0000 Subject: [PATCH] fully quality boost::enable_if since msvc namespaces dont work. --- include/boost/range/algorithm/for_each.hpp | 2 +- include/boost/range/detail/any_iterator.hpp | 6 +++--- include/boost/range/has_range_iterator.hpp | 4 ++-- include/boost/range/iterator_range_core.hpp | 16 ++++++++-------- include/boost/range/size.hpp | 2 +- include/boost/range/size_type.hpp | 2 +- include/boost/range/sub_range.hpp | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/boost/range/algorithm/for_each.hpp b/include/boost/range/algorithm/for_each.hpp index fe8ab80..ea731b2 100644 --- a/include/boost/range/algorithm/for_each.hpp +++ b/include/boost/range/algorithm/for_each.hpp @@ -32,7 +32,7 @@ namespace boost template inline UnaryFunction for_each_impl(Iterator first, Iterator last, UnaryFunction fun, - typename enable_if< + typename ::boost::enable_if< is_reference_wrapper, void >::type* = 0) diff --git a/include/boost/range/detail/any_iterator.hpp b/include/boost/range/detail/any_iterator.hpp index b45058e..9d1057c 100644 --- a/include/boost/range/detail/any_iterator.hpp +++ b/include/boost/range/detail/any_iterator.hpp @@ -356,7 +356,7 @@ namespace boost OtherDifference, Buffer >& other, - typename enable_if< + typename ::boost::enable_if< typename mpl::and_< typename is_mutable_reference::type, typename is_const_reference::type @@ -387,7 +387,7 @@ namespace boost , OtherDifference , Buffer >& other, - typename enable_if< + typename ::boost::enable_if< typename mpl::or_< typename mpl::and_< typename is_mutable_reference::type, @@ -423,7 +423,7 @@ namespace boost , OtherDifference , Buffer >& other, - typename enable_if< + typename ::boost::enable_if< typename is_convertible_to_value_as_reference< OtherReference , Reference diff --git a/include/boost/range/has_range_iterator.hpp b/include/boost/range/has_range_iterator.hpp index 26a6452..9eb58b3 100644 --- a/include/boost/range/has_range_iterator.hpp +++ b/include/boost/range/has_range_iterator.hpp @@ -35,7 +35,7 @@ namespace boost template struct has_range_iterator_impl< T, - BOOST_DEDUCED_TYPENAME enable_if< + BOOST_DEDUCED_TYPENAME ::boost::enable_if< BOOST_DEDUCED_TYPENAME mpl::eval_if, has_type::type> >, @@ -56,7 +56,7 @@ namespace boost template struct has_range_const_iterator_impl< T, - BOOST_DEDUCED_TYPENAME enable_if< + BOOST_DEDUCED_TYPENAME ::boost::enable_if< has_type > >::type > diff --git a/include/boost/range/iterator_range_core.hpp b/include/boost/range/iterator_range_core.hpp index e6c77f5..cefabd4 100644 --- a/include/boost/range/iterator_range_core.hpp +++ b/include/boost/range/iterator_range_core.hpp @@ -422,7 +422,7 @@ public: template iterator_range( const SinglePassRange& r, - BOOST_DEDUCED_TYPENAME enable_if< + BOOST_DEDUCED_TYPENAME ::boost::enable_if< is_compatible_range >::type* = 0 ) @@ -433,7 +433,7 @@ public: template iterator_range( SinglePassRange& r, - BOOST_DEDUCED_TYPENAME enable_if< + BOOST_DEDUCED_TYPENAME ::boost::enable_if< is_compatible_range >::type* = 0 ) @@ -497,7 +497,7 @@ public: // comparison operators ///////////////////////////////////////////////////////////////////// template - inline BOOST_DEDUCED_TYPENAME enable_if< + inline BOOST_DEDUCED_TYPENAME ::boost::enable_if< mpl::or_< is_convertible< const SinglePassRange1&, @@ -520,7 +520,7 @@ public: } template - inline BOOST_DEDUCED_TYPENAME enable_if< + inline BOOST_DEDUCED_TYPENAME ::boost::enable_if< mpl::or_< is_convertible< const SinglePassRange1&, @@ -543,7 +543,7 @@ public: } template - inline BOOST_DEDUCED_TYPENAME enable_if< + inline BOOST_DEDUCED_TYPENAME ::boost::enable_if< mpl::or_< is_convertible< const SinglePassRange1&, @@ -566,7 +566,7 @@ public: } template - inline BOOST_DEDUCED_TYPENAME enable_if< + inline BOOST_DEDUCED_TYPENAME ::boost::enable_if< mpl::or_< is_convertible< const SinglePassRange1&, @@ -589,7 +589,7 @@ public: } template - inline BOOST_DEDUCED_TYPENAME enable_if< + inline BOOST_DEDUCED_TYPENAME ::boost::enable_if< mpl::or_< is_convertible< const SinglePassRange1&, @@ -612,7 +612,7 @@ public: } template - inline BOOST_DEDUCED_TYPENAME enable_if< + inline BOOST_DEDUCED_TYPENAME ::boost::enable_if< mpl::or_< is_convertible< const SinglePassRange1&, diff --git a/include/boost/range/size.hpp b/include/boost/range/size.hpp index cd7a90e..d007bfc 100644 --- a/include/boost/range/size.hpp +++ b/include/boost/range/size.hpp @@ -30,7 +30,7 @@ namespace boost { template - inline typename enable_if< + inline typename ::boost::enable_if< has_member_size, typename range_size::type >::type diff --git a/include/boost/range/size_type.hpp b/include/boost/range/size_type.hpp index ffdc3ac..db5a59b 100644 --- a/include/boost/range/size_type.hpp +++ b/include/boost/range/size_type.hpp @@ -61,7 +61,7 @@ namespace boost template struct range_size< C, - BOOST_DEDUCED_TYPENAME enable_if, void>::type + BOOST_DEDUCED_TYPENAME ::boost::enable_if, void>::type > { typedef BOOST_DEDUCED_TYPENAME C::size_type type; diff --git a/include/boost/range/sub_range.hpp b/include/boost/range/sub_range.hpp index e2fc480..ecc045b 100644 --- a/include/boost/range/sub_range.hpp +++ b/include/boost/range/sub_range.hpp @@ -190,7 +190,7 @@ public: template< class ForwardRange2 > sub_range( ForwardRange2& r, - BOOST_DEDUCED_TYPENAME enable_if< + BOOST_DEDUCED_TYPENAME ::boost::enable_if< is_compatible_range >::type* = 0 ) @@ -201,7 +201,7 @@ public: template< class ForwardRange2 > sub_range( const ForwardRange2& r, - BOOST_DEDUCED_TYPENAME enable_if< + BOOST_DEDUCED_TYPENAME ::boost::enable_if< is_compatible_range >::type* = 0 ) @@ -235,7 +235,7 @@ public: { } template - BOOST_DEDUCED_TYPENAME enable_if< + BOOST_DEDUCED_TYPENAME ::boost::enable_if< is_compatible_range, sub_range& >::type @@ -246,7 +246,7 @@ public: } template - BOOST_DEDUCED_TYPENAME enable_if< + BOOST_DEDUCED_TYPENAME ::boost::enable_if< is_compatible_range, sub_range& >::type