diff options
Diffstat (limited to '3rdParty/Boost/src/boost/range/size.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/range/size.hpp | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/3rdParty/Boost/src/boost/range/size.hpp b/3rdParty/Boost/src/boost/range/size.hpp index 6ae74d1..d007bfc 100644 --- a/3rdParty/Boost/src/boost/range/size.hpp +++ b/3rdParty/Boost/src/boost/range/size.hpp @@ -11,7 +11,7 @@ #ifndef BOOST_RANGE_SIZE_HPP #define BOOST_RANGE_SIZE_HPP -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) # pragma once #endif @@ -19,24 +19,39 @@ #include <boost/range/begin.hpp> #include <boost/range/end.hpp> #include <boost/range/size_type.hpp> +#include <boost/range/detail/has_member_size.hpp> #include <boost/assert.hpp> +#include <boost/cstdint.hpp> +#include <boost/utility.hpp> namespace boost { namespace range_detail { + + template<class SinglePassRange> + inline typename ::boost::enable_if< + has_member_size<SinglePassRange>, + typename range_size<const SinglePassRange>::type + >::type + range_calculate_size(const SinglePassRange& rng) + { + return rng.size(); + } + template<class SinglePassRange> - inline BOOST_DEDUCED_TYPENAME range_size<const SinglePassRange>::type + inline typename disable_if< + has_member_size<SinglePassRange>, + typename range_size<const SinglePassRange>::type + >::type range_calculate_size(const SinglePassRange& rng) { - BOOST_ASSERT( (boost::end(rng) - boost::begin(rng)) >= 0 && - "reachability invariant broken!" ); - return boost::end(rng) - boost::begin(rng); + return std::distance(boost::begin(rng), boost::end(rng)); } } template<class SinglePassRange> - inline BOOST_DEDUCED_TYPENAME range_size<const SinglePassRange>::type + inline typename range_size<const SinglePassRange>::type size(const SinglePassRange& rng) { #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \ |