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

displabed some warnings and applied Ticket #1284: sub_range_copy.patch

Browse Source 
[SVN r40376]
This commit is contained in:
Thorsten Jørgen Ottosen
2007-10-23 19:50:59 +00:00
parent 17514e1d44
commit bbd9fdb7bd
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,9 @@
#endif #endif
#include <cstddef> #include <cstddef>
#if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(BOOST_MSVC, == 1400)
#pragma warning( disable : 4996 )
#endif
/*! \file /*! \file
Defines the \c iterator_class and related functions. Defines the \c iterator_class and related functions.

30
include/boost/range/sub_range.hpp
View File

@ -11,6 +11,10 @@
#ifndef BOOST_RANGE_SUB_RANGE_HPP #ifndef BOOST_RANGE_SUB_RANGE_HPP
#define BOOST_RANGE_SUB_RANGE_HPP #define BOOST_RANGE_SUB_RANGE_HPP
#if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(BOOST_MSVC, == 1400)
#pragma warning( disable : 4996 )
#endif
#include <boost/range/config.hpp> #include <boost/range/config.hpp>
#include <boost/range/iterator_range.hpp> #include <boost/range/iterator_range.hpp>
#include <boost/range/value_type.hpp> #include <boost/range/value_type.hpp>
@ -38,16 +42,12 @@ namespace boost
public: public:
sub_range() : base() sub_range() : base()
{ } { }
/* #if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(BOOST_MSVC, == 1400)
template< class ForwardRange2 > sub_range( const sub_range& r )
sub_range( sub_range<ForwardRange2> r ) : : base( static_cast<const base&>( r ) )
{ }
#if BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 800 ) #endif
base( impl::adl_begin( r ), impl::adl_end( r ) )
#else
base( r )
#endif */
template< class ForwardRange2 > template< class ForwardRange2 >
sub_range( ForwardRange2& r ) : sub_range( ForwardRange2& r ) :
@ -86,15 +86,11 @@ namespace boost
{ {
base::operator=( r ); base::operator=( r );
return *this; return *this;
} }
sub_range& operator=( sub_range r ) sub_range& operator=( const sub_range& r )
{ {
// base::operator=( static_cast<const base&>(r) );
// argument passed by value to avoid
// const_iterator to iterator conversion
//
base::operator=( r );
return *this; return *this;
} }