import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / range / begin.hpp

diff --git a/ceph/src/boost/boost/range/begin.hpp b/ceph/src/boost/boost/range/begin.hpp
index 4f53d4688cba431ddf96ab4321b2e326a97f707f..17d9f8423ce15157f7c03e70c6c72a83cebb0ace 100644 (file)
--- a/ceph/src/boost/boost/range/begin.hpp
+++ b/ceph/src/boost/boost/range/begin.hpp
@@ -17,10 +17,6 @@
 
 #include <boost/range/config.hpp>
 
-#ifdef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-#include <boost/range/detail/begin.hpp>
-#else
-
 #include <boost/range/iterator.hpp>
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
@@ -28,7 +24,7 @@
 namespace boost
 {
 
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 namespace range_detail
 {
 #endif
@@ -85,7 +81,7 @@ namespace range_detail
     }
 
 
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 } // namespace 'range_detail'
 #endif
 
@@ -101,7 +97,7 @@ BOOST_CONSTEXPR
 #endif
 inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T& r )
 {
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     using namespace range_detail;
 #endif
     return range_begin( r );
@@ -113,7 +109,7 @@ BOOST_CONSTEXPR
 #endif
 inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type begin( const T& r )
 {
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     using namespace range_detail;
 #endif
     return range_begin( r );
@@ -122,8 +118,6 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type begin( const T& r )
     } // namespace range_adl_barrier
 } // namespace boost
 
-#endif // BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-
 namespace boost
 {
     namespace range_adl_barrier