Make boost::distance traversal-category-aware (and constexpr in C++14)

boostorg · Jun 30, 2017 · 69409ed · 69409ed
1 parent 452b1bb
commit 69409ed
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/include/boost/range/distance.hpp b/include/boost/range/distance.hpp
@@ -15,18 +15,19 @@
 # pragma once
 #endif
 
+#include <boost/iterator/distance.hpp>
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/difference_type.hpp>
 
-namespace boost 
+namespace boost
 {
 
     template< class T >
-    inline BOOST_DEDUCED_TYPENAME range_difference<T>::type 
+    inline BOOST_CXX14_CONSTEXPR BOOST_DEDUCED_TYPENAME range_difference<T>::type
     distance( const T& r )
     {
-        return std::distance( boost::begin( r ), boost::end( r ) );
+        return boost::distance( boost::begin( r ), boost::end( r ) );
     }
 
 } // namespace 'boost'