From 6ab148be0195f856d243be825125a19bbb2aa4fc Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Sun, 23 Sep 2018 12:28:03 +0300 Subject: [PATCH] Revert "Revert "Replace using-declarations with using-directives to avoid ADL issues."" This reverts commit 06875a754d6a1e7ed14b761d26020239cf5ad0a2. The suggested fix for build failures need to be applied to Boost.Range: https://github.com/boostorg/range/pull/75 --- include/boost/iterator/advance.hpp | 2 +- include/boost/iterator/distance.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/iterator/advance.hpp b/include/boost/iterator/advance.hpp index 6f81cdb..92af8fb 100644 --- a/include/boost/iterator/advance.hpp +++ b/include/boost/iterator/advance.hpp @@ -77,7 +77,7 @@ namespace iterators { } // namespace iterators -using iterators::advance; +using namespace iterators::advance_adl_barrier; } // namespace boost diff --git a/include/boost/iterator/distance.hpp b/include/boost/iterator/distance.hpp index 8cf3f15..bef650b 100644 --- a/include/boost/iterator/distance.hpp +++ b/include/boost/iterator/distance.hpp @@ -58,7 +58,7 @@ namespace iterators { } // namespace iterators -using iterators::distance; +using namespace iterators::distance_adl_barrier; } // namespace boost