Merge pull request #44 from morinmorin/fix/unwanted_adl

Fix #43 (unwanted ADL issues)

include/boost/iterator/advance.hpp

@@ -77,7 +77,7 @@ namespace iterators {
 
 } // namespace iterators
 
-using iterators::advance;
+using namespace iterators::advance_adl_barrier;
 
 } // namespace boost
 

include/boost/iterator/distance.hpp

@@ -58,7 +58,7 @@ namespace iterators {
 
 } // namespace iterators
 
-using iterators::distance;
+using namespace iterators::distance_adl_barrier;
 
 } // namespace boost
 

test/Jamfile.v2

@@ -59,6 +59,7 @@ test-suite iterator
     [ run next_prior_test.cpp ]
     [ run advance_test.cpp ]
     [ run distance_test.cpp ]
+    [ compile adl_test.cpp ]
 
     [ run shared_iterator_test.cpp ]
 ;

test/adl_test.cpp

@@ -0,0 +1,25 @@
+// Copyright (C) 2017 Michel Morin.
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <vector>
+#include <boost/array.hpp>
+#include <boost/iterator/advance.hpp>
+#include <boost/iterator/distance.hpp>
+
+int main()
+{
+    // Test that boost::advance/distance are not found by ADL.
+    // (https://github.com/boostorg/iterator/issues/43)
+
+    typedef boost::array<int, 1> boost_type;
+    std::vector<boost_type> std_boost(2);
+    std::vector<boost_type>::iterator it = std_boost.begin();
+
+    advance(it, 2);
+    (void)distance(it, it);
+
+    return 0;
+}