|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r85915 - in trunk/boost: . range range/detail range/detail/vc6
From: steveire_at_[hidden]
Date: 2013-09-25 17:13:40
Author: skelly
Date: 2013-09-25 17:13:39 EDT (Wed, 25 Sep 2013)
New Revision: 85915
URL: http://svn.boost.org/trac/boost/changeset/85915
Log:
Range: Remove obsolete MSVC version checks.
Deleted:
trunk/boost/range/detail/vc6/end.hpp
trunk/boost/range/detail/vc6/size.hpp
Text files modified:
trunk/boost/range.hpp | 10 --
trunk/boost/range/config.hpp | 8 -
trunk/boost/range/detail/begin.hpp | 11 --
trunk/boost/range/detail/end.hpp | 21 ----
trunk/boost/range/detail/size.hpp | 23 ----
/dev/null | 170 ----------------------------------------
/dev/null | 166 ---------------------------------------
trunk/boost/range/iterator_range_core.hpp | 2
8 files changed, 9 insertions(+), 402 deletions(-)
Modified: trunk/boost/range.hpp
==============================================================================
--- trunk/boost/range.hpp Wed Sep 25 17:13:11 2013 (r85914)
+++ trunk/boost/range.hpp 2013-09-25 17:13:39 EDT (Wed, 25 Sep 2013) (r85915)
@@ -15,19 +15,9 @@
# pragma once
#endif
-#if defined(_MSC_VER) && (_MSC_VER == 1300)
-
-#include <boost/range/detail/collection_traits.hpp>
-#include <boost/range/iterator_range.hpp>
-#include <boost/range/sub_range.hpp>
-
-#else
-
#include <boost/range/functions.hpp>
#include <boost/range/metafunctions.hpp>
#include <boost/range/iterator_range.hpp>
#include <boost/range/sub_range.hpp>
-#endif // _MSC_VER == 1300
-
#endif
Modified: trunk/boost/range/config.hpp
==============================================================================
--- trunk/boost/range/config.hpp Wed Sep 25 17:13:11 2013 (r85914)
+++ trunk/boost/range/config.hpp 2013-09-25 17:13:39 EDT (Wed, 25 Sep 2013) (r85915)
@@ -26,18 +26,14 @@
#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
# define BOOST_RANGE_DEDUCED_TYPENAME typename
#else
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1300) && !defined(_MSC_EXTENSIONS)
-# define BOOST_RANGE_DEDUCED_TYPENAME typename
-# else
-# define BOOST_RANGE_DEDUCED_TYPENAME BOOST_DEDUCED_TYPENAME
-# endif
+#define BOOST_RANGE_DEDUCED_TYPENAME BOOST_DEDUCED_TYPENAME
#endif
#ifdef BOOST_RANGE_NO_ARRAY_SUPPORT
#error "macro already defined!"
#endif
-#if BOOST_WORKAROUND( BOOST_MSVC, < 1300 ) || BOOST_WORKAROUND( __MWERKS__, <= 0x3003 )
+#if BOOST_WORKAROUND( __MWERKS__, <= 0x3003 )
#define BOOST_RANGE_NO_ARRAY_SUPPORT 1
#endif
Modified: trunk/boost/range/detail/begin.hpp
==============================================================================
--- trunk/boost/range/detail/begin.hpp Wed Sep 25 17:13:11 2013 (r85914)
+++ trunk/boost/range/detail/begin.hpp 2013-09-25 17:13:39 EDT (Wed, 25 Sep 2013) (r85915)
@@ -15,9 +15,6 @@
#include <boost/detail/workaround.hpp>
#include <boost/range/iterator.hpp>
#include <boost/range/detail/common.hpp>
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1310)
-# include <boost/range/value_type.hpp>
-#endif
namespace boost
{
@@ -62,19 +59,11 @@
template<>
struct range_begin<array_>
{
- #if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
- template< typename T, std::size_t sz >
- static T* fun( T BOOST_RANGE_ARRAY_REF()[sz] )
- {
- return boost_range_array;
- }
- #else
template<typename T>
static BOOST_RANGE_DEDUCED_TYPENAME range_value<T>::type* fun(T& t)
{
return t;
}
- #endif
};
} // namespace 'range_detail'
Modified: trunk/boost/range/detail/end.hpp
==============================================================================
--- trunk/boost/range/detail/end.hpp Wed Sep 25 17:13:11 2013 (r85914)
+++ trunk/boost/range/detail/end.hpp 2013-09-25 17:13:39 EDT (Wed, 25 Sep 2013) (r85915)
@@ -14,15 +14,9 @@
#include <boost/config.hpp> // BOOST_MSVC
#include <boost/detail/workaround.hpp>
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-# include <boost/range/detail/vc6/end.hpp>
-#else
-# include <boost/range/detail/implementation_help.hpp>
-# include <boost/range/iterator.hpp>
-# include <boost/range/detail/common.hpp>
-# if BOOST_WORKAROUND(BOOST_MSVC, < 1310)
-# include <boost/range/detail/remove_extent.hpp>
-# endif
+#include <boost/range/detail/implementation_help.hpp>
+#include <boost/range/iterator.hpp>
+#include <boost/range/detail/common.hpp>
namespace boost
{
@@ -68,19 +62,11 @@
template<>
struct range_end<array_>
{
- #if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
- template< typename T, std::size_t sz >
- static T* fun( T BOOST_RANGE_ARRAY_REF()[sz] )
- {
- return boost::range_detail::array_end( boost_range_array );
- }
- #else
template<typename T>
static BOOST_RANGE_DEDUCED_TYPENAME remove_extent<T>::type* fun(T& t)
{
return t + remove_extent<T>::size;
}
- #endif
};
} // namespace 'range_detail'
@@ -97,5 +83,4 @@
} // namespace 'boost'
-# endif // VC6
#endif
Modified: trunk/boost/range/detail/size.hpp
==============================================================================
--- trunk/boost/range/detail/size.hpp Wed Sep 25 17:13:11 2013 (r85914)
+++ trunk/boost/range/detail/size.hpp 2013-09-25 17:13:39 EDT (Wed, 25 Sep 2013) (r85915)
@@ -14,16 +14,10 @@
#include <boost/config.hpp> // BOOST_MSVC
#include <boost/detail/workaround.hpp>
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-# include <boost/range/detail/vc6/size.hpp>
-#else
-# include <boost/range/detail/implementation_help.hpp>
-# include <boost/range/detail/size_type.hpp>
-# include <boost/range/detail/common.hpp>
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
-# include <boost/range/detail/remove_extent.hpp>
-# endif
-# include <iterator>
+#include <boost/range/detail/implementation_help.hpp>
+#include <boost/range/detail/size_type.hpp>
+#include <boost/range/detail/common.hpp>
+#include <iterator>
namespace boost
{
@@ -68,19 +62,11 @@
template<>
struct range_size_<array_>
{
- #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
- template< typename T, std::size_t sz >
- static std::size_t fun( T BOOST_RANGE_ARRAY_REF()[sz] )
- {
- return sz;
- }
- #else
template<typename T>
static std::size_t fun(T& t)
{
return remove_extent<T>::size;
}
- #endif
};
template<>
@@ -155,5 +141,4 @@
} // namespace 'boost'
-# endif
#endif
Deleted: trunk/boost/range/detail/vc6/end.hpp
==============================================================================
--- trunk/boost/range/detail/vc6/end.hpp 2013-09-25 17:13:39 EDT (Wed, 25 Sep 2013) (r85914)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,170 +0,0 @@
-// Boost.Range library
-//
-// Copyright Thorsten Ottosen 2003-2004. Use, modification and
-// distribution is subject to the Boost Software License, Version
-// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// For more information, see http://www.boost.org/libs/range/
-//
-
-#ifndef BOOST_RANGE_DETAIL_VC6_END_HPP
-#define BOOST_RANGE_DETAIL_VC6_END_HPP
-
-#include <boost/range/detail/implementation_help.hpp>
-#include <boost/range/detail/implementation_help.hpp>
-#include <boost/range/result_iterator.hpp>
-#include <boost/range/detail/common.hpp>
-#include <boost/range/detail/remove_extent.hpp>
-
-namespace boost
-{
- namespace range_detail
- {
- template< typename T >
- struct range_end;
-
- //////////////////////////////////////////////////////////////////////
- // default
- //////////////////////////////////////////////////////////////////////
-
- template<>
- struct range_end<std_container_>
- {
- template< typename C >
- struct inner {
- static BOOST_RANGE_DEDUCED_TYPENAME range_result_iterator<C>::type
- fun( C& c )
- {
- return c.end();
- };
- };
- };
-
- //////////////////////////////////////////////////////////////////////
- // pair
- //////////////////////////////////////////////////////////////////////
-
- template<>
- struct range_end<std_pair_>
- {
- template< typename P >
- struct inner {
- static BOOST_RANGE_DEDUCED_TYPENAME range_result_iterator<P>::type
- fun( const P& p )
- {
- return p.second;
- }
- };
- };
-
- //////////////////////////////////////////////////////////////////////
- // array
- //////////////////////////////////////////////////////////////////////
-
- template<>
- struct range_end<array_>
- {
- template< typename T >
- struct inner {
- static BOOST_DEDUCED_TYPENAME remove_extent<T>::type*
- fun(T& t)
- {
- return t + remove_extent<T>::size;
- }
- };
- };
-
-
- template<>
- struct range_end<char_array_>
- {
- template< typename T >
- struct inner {
- static BOOST_DEDUCED_TYPENAME remove_extent<T>::type*
- fun(T& t)
- {
- return t + remove_extent<T>::size;
- }
- };
- };
-
- template<>
- struct range_end<wchar_t_array_>
- {
- template< typename T >
- struct inner {
- static BOOST_DEDUCED_TYPENAME remove_extent<T>::type*
- fun(T& t)
- {
- return t + remove_extent<T>::size;
- }
- };
- };
-
- //////////////////////////////////////////////////////////////////////
- // string
- //////////////////////////////////////////////////////////////////////
-
- template<>
- struct range_end<char_ptr_>
- {
- template< typename T >
- struct inner {
- static char* fun( char* s )
- {
- return boost::range_detail::str_end( s );
- }
- };
- };
-
- template<>
- struct range_end<const_char_ptr_>
- {
- template< typename T >
- struct inner {
- static const char* fun( const char* s )
- {
- return boost::range_detail::str_end( s );
- }
- };
- };
-
- template<>
- struct range_end<wchar_t_ptr_>
- {
- template< typename T >
- struct inner {
- static wchar_t* fun( wchar_t* s )
- {
- return boost::range_detail::str_end( s );
- }
- };
- };
-
-
- template<>
- struct range_end<const_wchar_t_ptr_>
- {
- template< typename T >
- struct inner {
- static const wchar_t* fun( const wchar_t* s )
- {
- return boost::range_detail::str_end( s );
- }
- };
- };
-
- } // namespace 'range_detail'
-
- template< typename C >
- inline BOOST_DEDUCED_TYPENAME range_result_iterator<C>::type
- end( C& c )
- {
- return range_detail::range_end<range_detail::range<C>::type>::inner<C>::fun( c );
- }
-
-} // namespace 'boost'
-
-
-#endif
Deleted: trunk/boost/range/detail/vc6/size.hpp
==============================================================================
--- trunk/boost/range/detail/vc6/size.hpp 2013-09-25 17:13:39 EDT (Wed, 25 Sep 2013) (r85914)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,166 +0,0 @@
-// Boost.Range library
-//
-// Copyright Thorsten Ottosen 2003-2004. Use, modification and
-// distribution is subject to the Boost Software License, Version
-// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// For more information, see http://www.boost.org/libs/range/
-//
-
-
-#ifndef BOOST_RANGE_DETAIL_VC6_SIZE_HPP
-#define BOOST_RANGE_DETAIL_VC6_SIZE_HPP
-
-#include <boost/range/detail/implementation_help.hpp>
-#include <boost/range/detail/size_type.hpp>
-#include <boost/range/detail/common.hpp>
-#include <boost/range/detail/remove_extent.hpp>
-#include <iterator>
-
-namespace boost
-{
- namespace range_detail
- {
- template< typename T >
- struct range_size_;
-
- //////////////////////////////////////////////////////////////////////
- // default
- //////////////////////////////////////////////////////////////////////
-
- template<>
- struct range_size_<std_container_>
- {
- template< typename C >
- struct inner {
- static BOOST_RANGE_DEDUCED_TYPENAME C::size_type fun( const C& c )
- {
- return c.size();
- };
- };
- };
-
- //////////////////////////////////////////////////////////////////////
- // pair
- //////////////////////////////////////////////////////////////////////
-
- template<>
- struct range_size_<std_pair_>
- {
- template< typename P >
- struct inner {
- static BOOST_RANGE_DEDUCED_TYPENAME range_size<P>::type
- fun( const P& p )
- {
- return std::distance( p.first, p.second );
- }
- };
- };
-
- //////////////////////////////////////////////////////////////////////
- // array
- //////////////////////////////////////////////////////////////////////
-
- template<>
- struct range_size_<array_>
- {
- template<typename T>
- struct inner {
- static std::size_t fun(T& t)
- {
- return remove_extent<T>::size;
- }
- };
- };
-
- template<>
- struct range_size_<char_array_>
- {
- template<typename T>
- struct inner {
- static std::size_t fun(T& t)
- {
- return sizeof(T) / sizeof(T[0]);
- }
- };
- };
-
- template<>
- struct range_size_<wchar_t_array_>
- {
- template<typename T>
- struct inner {
- static std::size_t fun(T& t)
- {
- return sizeof(T) / sizeof(T[0]);
- }
- };
- };
-
- //////////////////////////////////////////////////////////////////////
- // string
- //////////////////////////////////////////////////////////////////////
-
- template<>
- struct range_size_<char_ptr_>
- {
- template<typename T>
- struct inner {
- static std::size_t fun( const char* s )
- {
- return boost::range_detail::str_size( s );
- }
- };
- };
-
- template<>
- struct range_size_<const_char_ptr_>
- {
- template<typename T>
- struct inner {
- static std::size_t fun( const char* s )
- {
- return boost::range_detail::str_size( s );
- }
- };
- };
-
- template<>
- struct range_size_<wchar_t_ptr_>
- {
- template<typename T>
- struct inner {
- static std::size_t fun( const wchar_t* s )
- {
- return boost::range_detail::str_size( s );
- }
- };
- };
-
- template<>
- struct range_size_<const_wchar_t_ptr_>
- {
- template<typename T>
- struct inner {
- static std::size_t fun( const wchar_t* s )
- {
- return boost::range_detail::str_size( s );
- }
- };
- };
-
- } // namespace 'range_detail'
-
-
- template< typename C >
- BOOST_RANGE_DEDUCED_TYPENAME range_size<C>::type
- size( const C& c )
- {
- return range_detail::range_size_<range_detail::range<C>::type>::inner<C>::fun( c );
- }
-
-} // namespace 'boost'
-
-
-#endif
Modified: trunk/boost/range/iterator_range_core.hpp
==============================================================================
--- trunk/boost/range/iterator_range_core.hpp Wed Sep 25 17:13:11 2013 (r85914)
+++ trunk/boost/range/iterator_range_core.hpp 2013-09-25 17:13:39 EDT (Wed, 25 Sep 2013) (r85915)
@@ -207,14 +207,12 @@
m_Begin( impl::adl_begin( r ) ), m_End( impl::adl_end( r ) )
{}
- #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
this_type& operator=( const this_type& r )
{
m_Begin = r.begin();
m_End = r.end();
return *this;
}
- #endif
template< class Iterator >
iterator_range& operator=( const iterator_range<Iterator>& r )
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk