From 4f66482414c060d8d08310bb5dd14dff84611a92 Mon Sep 17 00:00:00 2001 From: tobias-loew Date: Wed, 12 Aug 2015 15:32:31 +0200 Subject: [PATCH] Ticket #10397 - compilation error with mfc-iteratior-support: ambiguous symbol fixed compilation error for mfc-iteration-support changed boost::range_detail::range_const_iterator to boost::range_detail::range_const_iterator_helper to address compilation error when using mfc-iteration-support --- include/boost/range/const_iterator.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/range/const_iterator.hpp b/include/boost/range/const_iterator.hpp index 3413e59..727fdad 100644 --- a/include/boost/range/const_iterator.hpp +++ b/include/boost/range/const_iterator.hpp @@ -36,7 +36,7 @@ namespace boost BOOST_RANGE_EXTRACT_OPTIONAL_TYPE( const_iterator ) template< typename C > -struct range_const_iterator +struct range_const_iterator_helper : extract_const_iterator {}; @@ -45,7 +45,7 @@ struct range_const_iterator ////////////////////////////////////////////////////////////////////////// template< typename Iterator > -struct range_const_iterator > +struct range_const_iterator_helper > { typedef Iterator type; }; @@ -55,7 +55,7 @@ struct range_const_iterator > ////////////////////////////////////////////////////////////////////////// template< typename T, std::size_t sz > -struct range_const_iterator< T[sz] > +struct range_const_iterator_helper< T[sz] > { typedef const T* type; }; @@ -64,7 +64,7 @@ struct range_const_iterator< T[sz] > template struct range_const_iterator - : range_detail::range_const_iterator< + : range_detail::range_const_iterator_helper< BOOST_DEDUCED_TYPENAME remove_reference::type > {