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
#include <cstddef>
#if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(BOOST_MSVC, == 1400)
#pragma warning( disable : 4996 )
#endif
/*! \file
Defines the \c iterator_class and related functions.

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

@ -11,6 +11,10 @@
#ifndef 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/iterator_range.hpp>
#include <boost/range/value_type.hpp>
@ -39,15 +43,11 @@ namespace boost
sub_range() : base()
{ }
/*
template< class ForwardRange2 >
sub_range( sub_range<ForwardRange2> r ) :
#if BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 800 )
base( impl::adl_begin( r ), impl::adl_end( r ) )
#else
base( r )
#endif */
#if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(BOOST_MSVC, == 1400)
sub_range( const sub_range& r )
: base( static_cast<const base&>( r ) )
{ }
#endif
template< class ForwardRange2 >
sub_range( ForwardRange2& r ) :
@ -88,13 +88,9 @@ namespace boost
return *this;
}
sub_range& operator=( sub_range r )
sub_range& operator=( const sub_range& r )
{
//
// argument passed by value to avoid
// const_iterator to iterator conversion
//
base::operator=( r );
base::operator=( static_cast<const base&>(r) );
return *this;
}