import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / range / test / string.cpp

diff --git a/ceph/src/boost/libs/range/test/string.cpp b/ceph/src/boost/libs/range/test/string.cpp
index 9ff13f92e3cb866788b82eb995b903b7e82d3b62..1935ffdd0b9d1c12759071f5200fb885e2f3a866 100644 (file)
--- a/ceph/src/boost/libs/range/test/string.cpp
+++ b/ceph/src/boost/libs/range/test/string.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
@@ -28,6 +28,7 @@
 #include <boost/config.hpp>
 #include <vector>
 #include <fstream>
+#include <iterator>
 #include <algorithm>
 
 namespace
@@ -146,7 +147,7 @@ void check_char()
     char*            char_s2 = a_string.mutable_sz();
 
     BOOST_STATIC_ASSERT(( is_same<  range_value<char_iterator_t>::type,
-                                    detail::iterator_traits<char_iterator_t>::value_type>::value ));
+                                    std::iterator_traits<char_iterator_t>::value_type>::value ));
     BOOST_STATIC_ASSERT(( is_same<  range_iterator<char_iterator_t>::type, char_iterator_t >::value ));
 
     BOOST_STATIC_ASSERT(( is_same<  range_difference<char_iterator_t>::type,
@@ -225,11 +226,11 @@ void check_string()
     wchar_t*        char_ws2     = a_wide_string.mutable_sz();
 
     BOOST_STATIC_ASSERT(( is_same< range_value<wchar_iterator_t>::type,
-                                   detail::iterator_traits<wchar_iterator_t>::value_type>::value ));
+                                   std::iterator_traits<wchar_iterator_t>::value_type>::value ));
     BOOST_STATIC_ASSERT(( is_same< range_iterator<wchar_iterator_t>::type, wchar_iterator_t >::value ));
     BOOST_STATIC_ASSERT(( is_same< range_iterator<const wchar_t*>::type, const wchar_t* >::value ));
     BOOST_STATIC_ASSERT(( is_same< range_difference<wchar_iterator_t>::type,
-                                   detail::iterator_traits<wchar_iterator_t>::difference_type >::value ));
+                                   std::iterator_traits<wchar_iterator_t>::difference_type >::value ));
     BOOST_STATIC_ASSERT(( is_same< range_size<wchar_iterator_t>::type, std::size_t >::value ));
     BOOST_STATIC_ASSERT(( is_same< range_iterator<wchar_iterator_t>::type, wchar_iterator_t >::value ));
     BOOST_STATIC_ASSERT(( is_same< range_iterator<const wchar_t*>::type, const wchar_t* >::value ));