iterator_range disables msvc warning 4996

<http://svn.boost.org/trac/boost/ticket/1565>

[range] sub_range assignment issue
    <http://svn.boost.org/trac/boost/ticket/1284> 

[SVN r43155]
This commit is contained in:
Thorsten Jørgen Ottosen
2008-02-07 14:41:04 +00:00
parent 73db2a05b6
commit 428e72ed22
2 changed files with 17 additions and 8 deletions

View File

@ -11,6 +11,11 @@
#ifndef BOOST_RANGE_ITERATOR_RANGE_HPP #ifndef BOOST_RANGE_ITERATOR_RANGE_HPP
#define BOOST_RANGE_ITERATOR_RANGE_HPP #define BOOST_RANGE_ITERATOR_RANGE_HPP
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500)
#pragma warning( push )
#pragma warning( disable : 4996 )
#endif
// From boost/dynamic_bitset.hpp; thanks to Matthias Troyer for Cray X1 patch. // From boost/dynamic_bitset.hpp; thanks to Matthias Troyer for Cray X1 patch.
#include <boost/config.hpp> // Define __STL_CONFIG_H, if appropriate. #include <boost/config.hpp> // Define __STL_CONFIG_H, if appropriate.
#ifndef BOOST_OLD_IOSTREAMS #ifndef BOOST_OLD_IOSTREAMS
@ -38,10 +43,6 @@
#endif // _STLP_NO_IOSTREAMS #endif // _STLP_NO_IOSTREAMS
#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.
\c iterator_range is a simple wrapper of iterator pair idiom. It provides \c iterator_range is a simple wrapper of iterator pair idiom. It provides
@ -639,5 +640,9 @@ namespace boost
#undef BOOST_OLD_IOSTREAMS #undef BOOST_OLD_IOSTREAMS
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500)
#pragma warning( pop )
#endif
#endif #endif

View File

@ -11,12 +11,12 @@
#ifndef BOOST_RANGE_SUB_RANGE_HPP #ifndef BOOST_RANGE_SUB_RANGE_HPP
#define BOOST_RANGE_SUB_RANGE_HPP #define BOOST_RANGE_SUB_RANGE_HPP
#include <boost/detail/workaround.hpp> #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500)
#pragma warning( push )
#if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(BOOST_MSVC, == 1400)
#pragma warning( disable : 4996 ) #pragma warning( disable : 4996 )
#endif #endif
#include <boost/detail/workaround.hpp>
#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>
@ -46,7 +46,7 @@ namespace boost
sub_range() : base() sub_range() : base()
{ } { }
#if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(BOOST_MSVC, == 1400) #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500) )
sub_range( const sub_range& r ) sub_range( const sub_range& r )
: base( static_cast<const base&>( r ) ) : base( static_cast<const base&>( r ) )
{ } { }
@ -163,5 +163,9 @@ namespace boost
} // namespace 'boost' } // namespace 'boost'
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500)
#pragma warning( pop )
#endif
#endif #endif