Merge from trunk.

[SVN r43211]
This commit is contained in:
Daniel James
2008-02-10 15:26:54 +00:00
parent b4b13ae470
commit 2321b5c2fe
3 changed files with 8 additions and 4 deletions

View File

@ -25,6 +25,8 @@ namespace boost
{ {
namespace range_detail namespace range_detail
{ {
template <typename T>
inline void boost_range_silence_warning( const T& ) { }
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// end() help // end() help
@ -82,12 +84,14 @@ namespace boost
template< class T, std::size_t sz > template< class T, std::size_t sz >
inline std::size_t array_size( T BOOST_RANGE_ARRAY_REF()[sz] ) inline std::size_t array_size( T BOOST_RANGE_ARRAY_REF()[sz] )
{ {
boost_range_silence_warning( boost_range_array );
return sz; return sz;
} }
template< class T, std::size_t sz > template< class T, std::size_t sz >
inline std::size_t array_size( const T BOOST_RANGE_ARRAY_REF()[sz] ) inline std::size_t array_size( const T BOOST_RANGE_ARRAY_REF()[sz] )
{ {
boost_range_silence_warning( boost_range_array );
return sz; return sz;
} }

View File

@ -11,7 +11,7 @@
#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) #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4996 ) #pragma warning( disable : 4996 )
#endif #endif
@ -640,7 +640,7 @@ namespace boost
#undef BOOST_OLD_IOSTREAMS #undef BOOST_OLD_IOSTREAMS
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500) #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
#pragma warning( pop ) #pragma warning( pop )
#endif #endif

View File

@ -11,7 +11,7 @@
#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, BOOST_TESTED_AT(1500) #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4996 ) #pragma warning( disable : 4996 )
#endif #endif
@ -163,7 +163,7 @@ namespace boost
} // namespace 'boost' } // namespace 'boost'
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500) #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1500))
#pragma warning( pop ) #pragma warning( pop )
#endif #endif