boostorg/range
1
0
Fork 1
mirror of https://github.com/boostorg/range.git synced 2025-07-30 12:57:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation

Browse Source 
boost::detail::iterator_traits was used without including the necessary header file. It's deprecated anyway and only maps to std::iterator_traits.
This commit is contained in:
Marcel Raad
2015-09-18 09:54:08 +02:00
parent 64c83341ab
commit 9bf860fd30
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/range/concepts.hpp
View File

@ -25,6 +25,8 @@
#include <boost/range/detail/misc_concept.hpp> #include <boost/range/detail/misc_concept.hpp>
#include <boost/type_traits/remove_reference.hpp> #include <boost/type_traits/remove_reference.hpp>
#include <iterator>
/*! /*!
* \file * \file
* \brief Concept checks for the Boost Range library. * \brief Concept checks for the Boost Range library.
@ -164,10 +166,10 @@ namespace boost {
// work // work
(void)(i++); (void)(i++);
BOOST_DEDUCED_TYPENAME boost::detail::iterator_traits<Iterator>::reference r1(*i); BOOST_DEDUCED_TYPENAME std::iterator_traits<Iterator>::reference r1(*i);
boost::ignore_unused_variable_warning(r1); boost::ignore_unused_variable_warning(r1);
BOOST_DEDUCED_TYPENAME boost::detail::iterator_traits<Iterator>::reference r2(*(++i)); BOOST_DEDUCED_TYPENAME std::iterator_traits<Iterator>::reference r2(*(++i));
boost::ignore_unused_variable_warning(r2); boost::ignore_unused_variable_warning(r2);
} }
private: private:
@ -181,7 +183,7 @@ namespace boost {
, DefaultConstructible<Iterator> , DefaultConstructible<Iterator>
{ {
#if BOOST_RANGE_ENABLE_CONCEPT_ASSERT #if BOOST_RANGE_ENABLE_CONCEPT_ASSERT
typedef BOOST_DEDUCED_TYPENAME boost::detail::iterator_traits<Iterator>::difference_type difference_type; typedef BOOST_DEDUCED_TYPENAME std::iterator_traits<Iterator>::difference_type difference_type;
BOOST_MPL_ASSERT((is_integral<difference_type>)); BOOST_MPL_ASSERT((is_integral<difference_type>));
BOOST_MPL_ASSERT_RELATION(std::numeric_limits<difference_type>::is_signed, ==, true); BOOST_MPL_ASSERT_RELATION(std::numeric_limits<difference_type>::is_signed, ==, true);
@ -200,7 +202,7 @@ namespace boost {
// is convertible to reference. // is convertible to reference.
Iterator i2(i++); Iterator i2(i++);
boost::ignore_unused_variable_warning(i2); boost::ignore_unused_variable_warning(i2);
BOOST_DEDUCED_TYPENAME boost::detail::iterator_traits<Iterator>::reference r(*(i++)); BOOST_DEDUCED_TYPENAME std::iterator_traits<Iterator>::reference r(*(i++));
boost::ignore_unused_variable_warning(r); boost::ignore_unused_variable_warning(r);
} }
private: private: