Merge from trunk, finally.

[SVN r41817]
This commit is contained in:
Daniel James
2007-12-07 01:12:02 +00:00
parent b148e2fee6
commit c1aea25e44
2 changed files with 4 additions and 4 deletions

View File

@ -25,12 +25,10 @@ namespace boost
//////////////////////////////////////////////////////////////////////
template< typename T, std::size_t sz >
char&
sizer( const T BOOST_RANGE_ARRAY_REF()[sz] )[sz];
char (& sizer( const T BOOST_RANGE_ARRAY_REF()[sz] ) )[sz];
template< typename T, std::size_t sz >
char&
sizer( T BOOST_RANGE_ARRAY_REF()[sz] )[sz];
char (& sizer( T BOOST_RANGE_ARRAY_REF()[sz] ) )[sz];
} // namespace 'boost'

View File

@ -11,6 +11,8 @@
#ifndef BOOST_RANGE_SUB_RANGE_HPP
#define BOOST_RANGE_SUB_RANGE_HPP
#include <boost/detail/workaround.hpp>
#if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(BOOST_MSVC, == 1400)
#pragma warning( disable : 4996 )
#endif