Imported Upstream version 1.66.0upstream/1.66.0

3 files changed, 8 insertions, 6 deletions

diff --git a/libs/range/doc/html/index.html b/libs/range/doc/html/index.html
index 890e7d4d7b..5bc9281c30 100644
--- a/libs/range/doc/html/index.html
+++ b/libs/range/doc/html/index.html
@@ -150,7 +150,7 @@
   </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: September 02, 2017 at 10:14:07 GMT</small></p></td>
+<td align="left"><p><small>Last revised: December 14, 2017 at 00:11:48 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
diff --git a/libs/range/test/algorithm.cpp b/libs/range/test/algorithm.cpp
index ebe0496e4b..e945d421ea 100644
--- a/libs/range/test/algorithm.cpp
+++ b/libs/range/test/algorithm.cpp
@@ -457,7 +457,7 @@ void simple_compile_test()
 
     BOOST_RANGE_RETURNS_TEST2( find_end, v, std::less<int>() );
     BOOST_RANGE_RETURNS_TEST2( find_first_of, v, std::less<int>() );
-    BOOST_RANGE_RETURNS_TEST2( search, v, std::less<int>() );
+    BOOST_RANGE_RETURNS_TEST2( boost::search, v, std::less<int>() );
     BOOST_RANGE_RETURNS_TEST2( lower_bound, 0, std::less<int>() );
     BOOST_RANGE_RETURNS_TEST2( upper_bound, 0, std::less<int>() );
 
diff --git a/libs/range/test/iterator_pair.cpp b/libs/range/test/iterator_pair.cpp
index ba13d75cac..7b615a9fd5 100644
--- a/libs/range/test/iterator_pair.cpp
+++ b/libs/range/test/iterator_pair.cpp
@@ -22,6 +22,8 @@
 #include <boost/type_traits.hpp>
 #include <boost/test/test_tools.hpp>
 #include <vector>
+#include <iterator>
+#include <utility>
 
 void check_iterator_pair()
 {
@@ -39,23 +41,23 @@ void check_iterator_pair()
 
 
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_value<pair_t>::type,
-                          boost::detail::iterator_traits<pair_t::first_type>::value_type>::value ));
+                          std::iterator_traits<pair_t::first_type>::value_type>::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_iterator<pair_t>::type, pair_t::first_type >::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_const_iterator<pair_t>::type, pair_t::first_type >::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_difference<pair_t>::type,
-                          boost::detail::iterator_traits<pair_t::first_type>::difference_type >::value ));
+                          std::iterator_traits<pair_t::first_type>::difference_type >::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_size<pair_t>::type, std::size_t >::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_iterator<pair_t>::type, pair_t::first_type >::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_iterator<const_pair_t>::type, const_pair_t::first_type >::value ));
 
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_value<const_pair_tt>::type,
-                          boost::detail::iterator_traits<const_pair_t::first_type>::value_type>::value ));
+                          std::iterator_traits<const_pair_t::first_type>::value_type>::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_iterator<const_pair_tt>::type, const_pair_tt::first_type >::value ));
     //
     // This behavior is not supported with v2.
     //BOOST_STATIC_ASSERT(( is_same< range_const_iterator<const_pair_tt>::type, const_pair_tt::first_type >::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_difference<const_pair_tt>::type,
-                          boost::detail::iterator_traits<const_pair_tt::first_type>::difference_type >::value ));
+                          std::iterator_traits<const_pair_tt::first_type>::difference_type >::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_size<const_pair_tt>::type, std::size_t >::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_iterator<const_pair_tt>::type, const_pair_tt::first_type >::value ));
     BOOST_STATIC_ASSERT(( boost::is_same< boost::range_iterator<const_pair_tt>::type, const_pair_tt::first_type >::value ));