feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

*** empty log message ***

Browse Source 
[SVN r23252]
This commit is contained in:
Thorsten Jørgen Ottosen
2004-06-29 09:06:52 +00:00
parent ee8211dc0f
commit d85e5a45a8
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/boost/range/iterator_range.hpp
View File

@ -14,8 +14,6 @@
#include <boost/range/config.hpp> #include <boost/range/config.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
#include <boost/range/empty.hpp>
#include <boost/range/size.hpp>
#include <boost/iterator/iterator_traits.hpp> #include <boost/iterator/iterator_traits.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <iterator> #include <iterator>
@ -164,7 +162,12 @@ namespace boost {
*/ */
size_type size() const size_type size() const
{ {
return boost::size( make_pair( begin(), end() ) ); return std::distance( m_Begin, m_End );
}
bool empty() const
{
return m_Begin == m_End;
} }
//! Swap //! Swap
@ -173,8 +176,8 @@ namespace boost {
*/ */
void swap( iterator_range& Other ) void swap( iterator_range& Other )
{ {
std::swap( m_Begin, Other.begin() ); std::swap( m_Begin, Other.m_Begin );
std::swap( m_End, Other.end() ); std::swap( m_End, Other.m_End );
} }
//! Safe bool conversion //! Safe bool conversion
@ -192,7 +195,7 @@ namespace boost {
typedef iterator (iterator_range::*unspecified_bool_type) () const; typedef iterator (iterator_range::*unspecified_bool_type) () const;
operator unspecified_bool_type() const operator unspecified_bool_type() const
{ {
return empty( *this )? 0: &iterator_range::end; return empty() ? 0: &iterator_range::end;
} }
/* /*