|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r86079 - in trunk/boost/iostreams: . detail detail/adapter detail/config detail/vc6 device filter
From: steveire_at_[hidden]
Date: 2013-09-30 12:03:16
Author: skelly
Date: 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013)
New Revision: 86079
URL: http://svn.boost.org/trac/boost/changeset/86079
Log:
IOStreams: Remove obsolete MSVC version checks.
Deleted:
trunk/boost/iostreams/detail/vc6/close.hpp
trunk/boost/iostreams/detail/vc6/read.hpp
trunk/boost/iostreams/detail/vc6/write.hpp
Text files modified:
trunk/boost/iostreams/chain.hpp | 26 ---
trunk/boost/iostreams/close.hpp | 6 -
trunk/boost/iostreams/compose.hpp | 3
trunk/boost/iostreams/copy.hpp | 4
trunk/boost/iostreams/detail/adapter/mode_adapter.hpp | 22 +--
trunk/boost/iostreams/detail/config/overload_resolution.hpp | 3
trunk/boost/iostreams/detail/default_arg.hpp | 8 -
trunk/boost/iostreams/detail/forward.hpp | 41 ++----
trunk/boost/iostreams/detail/ios.hpp | 3
trunk/boost/iostreams/detail/is_dereferenceable.hpp | 3
trunk/boost/iostreams/detail/is_iterator_range.hpp | 15 --
trunk/boost/iostreams/detail/push.hpp | 3
trunk/boost/iostreams/detail/resolve.hpp | 17 +-
trunk/boost/iostreams/detail/restrict_impl.hpp | 3
/dev/null | 129 ---------------------
/dev/null | 238 ----------------------------------------
/dev/null | 159 --------------------------
trunk/boost/iostreams/detail/wrap_unwrap.hpp | 29 ----
trunk/boost/iostreams/device/array.hpp | 17 --
trunk/boost/iostreams/filter/bzip2.hpp | 12 -
trunk/boost/iostreams/filter/test.hpp | 12 -
trunk/boost/iostreams/filter/zlib.hpp | 12 -
trunk/boost/iostreams/pipeline.hpp | 14 --
trunk/boost/iostreams/read.hpp | 6 -
trunk/boost/iostreams/traits.hpp | 10 -
trunk/boost/iostreams/write.hpp | 6 -
26 files changed, 60 insertions(+), 741 deletions(-)
Modified: trunk/boost/iostreams/chain.hpp
==============================================================================
--- trunk/boost/iostreams/chain.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/chain.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -39,10 +39,7 @@
#include <boost/throw_exception.hpp>
#include <boost/type_traits/is_convertible.hpp>
#include <boost/type.hpp>
-#include <boost/iostreams/detail/execute.hpp> // VC6.5 requires this
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1310) // #include order
-# include <boost/mpl/int.hpp>
-#endif
+#include <boost/iostreams/detail/execute.hpp>
// Sometimes type_info objects must be compared by name. Borrowed from
// Boost.Python and Boost.Function.
@@ -58,20 +55,15 @@
# define BOOST_IOSTREAMS_COMPARE_TYPE_ID(X,Y) ((X)==(Y))
#endif
-// Deprecated
+// Deprecated. Unused.
#define BOOST_IOSTREAMS_COMPONENT_TYPE(chain, index) \
chain.component_type( index ) \
/**/
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
-# define BOOST_IOSTREAMS_COMPONENT(chain, index, target) \
+// Deprecated. Unused.
+#define BOOST_IOSTREAMS_COMPONENT(chain, index, target) \
chain.component< target >( index ) \
/**/
-#else
-# define BOOST_IOSTREAMS_COMPONENT(chain, index, target) \
- chain.component( index, ::boost::type< target >() ) \
- /**/
-#endif
namespace boost { namespace iostreams {
@@ -180,7 +172,6 @@
return (*boost::next(list().begin(), n))->component_type();
}
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
// Deprecated.
template<int N>
const std::type_info& component_type() const { return component_type(N); }
@@ -191,9 +182,8 @@
// Deprecated.
template<int N, typename T>
T* component() const { return component<T>(N); }
-#endif
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
+#if !BOOST_WORKAROUND(BOOST_MSVC, == 1310)
private:
#endif
template<typename T>
@@ -456,7 +446,6 @@
const std::type_info& component_type(int n) const
{ return chain_->component_type(n); }
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
// Deprecated.
template<int N>
const std::type_info& component_type() const
@@ -470,11 +459,6 @@
template<int N, typename T>
T* component() const
{ return chain_->BOOST_NESTED_TEMPLATE component<N, T>(); }
-#else
- template<typename T>
- T* component(int n, boost::type<T> t) const
- { return chain_->component(n, t); }
-#endif
bool is_complete() const { return chain_->is_complete(); }
bool auto_close() const { return chain_->auto_close(); }
Modified: trunk/boost/iostreams/close.hpp
==============================================================================
--- trunk/boost/iostreams/close.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/close.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -77,10 +77,6 @@
} } // End namespaces iostreams, boost.
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) //-----------------------------------//
-# include <boost/iostreams/detail/vc6/close.hpp>
-#else // #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) //--------------------------//
-
namespace boost { namespace iostreams {
namespace detail {
@@ -252,8 +248,6 @@
} } // End namespaces iostreams, boost.
-#endif // #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) //-------------------------//
-
#include <boost/iostreams/detail/config/enable_warnings.hpp>
#endif // #ifndef BOOST_IOSTREAMS_CLOSE_HPP_INCLUDED
Modified: trunk/boost/iostreams/compose.hpp
==============================================================================
--- trunk/boost/iostreams/compose.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/compose.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -379,7 +379,6 @@
{ return compose(flt, fod, is_std_io<FilterOrDevice>()); }
# if !BOOST_WORKAROUND(__BORLANDC__, < 0x600) && \
- !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && \
!defined(__GNUC__) // ---------------------------------------------------//
template<typename Filter, typename FilterOrDevice>
@@ -387,7 +386,7 @@
compose (const Filter& filter, FilterOrDevice& fod)
{ return composite<Filter, FilterOrDevice>(filter, fod); }
-# endif // Borland 5.x, VC6-7.0 or GCC 2.9x //--------------------------------//
+# endif // Borland 5.x or GCC //--------------------------------//
#endif // #ifndef BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION //---------------//
//----------------------------------------------------------------------------//
Modified: trunk/boost/iostreams/copy.hpp
==============================================================================
--- trunk/boost/iostreams/copy.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/copy.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -202,8 +202,6 @@
buffer_size );
}
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) //---------------------------------//
-
// Overload of copy() for the case where the source, but not the sink, is
// a standard stream or stream buffer
template<typename Source, typename Sink>
@@ -245,8 +243,6 @@
return detail::copy_impl(detail::wrap(src), detail::wrap(snk), buffer_size);
}
-#endif // #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) //-----------------------//
-
} } // End namespaces iostreams, boost.
#endif // #ifndef BOOST_IOSTREAMS_COPY_HPP_INCLUDED
Modified: trunk/boost/iostreams/detail/adapter/mode_adapter.hpp
==============================================================================
--- trunk/boost/iostreams/detail/adapter/mode_adapter.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/adapter/mode_adapter.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -38,9 +38,7 @@
device_tag,
mpl::if_<is_filter<T>, filter_tag, device_tag>,
mpl::if_<is_filter<T>, multichar_tag, empty_base>,
- #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
- closable_tag, // VC6 can't see member close()!
- #endif
+ closable_tag,
localizable_tag
{ };
explicit mode_adapter(const component_type& t) : t_(t) { }
@@ -52,10 +50,8 @@
std::streampos seek( stream_offset off, BOOST_IOS::seekdir way,
BOOST_IOS::openmode which =
BOOST_IOS::in | BOOST_IOS::out );
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
void close();
void close(BOOST_IOS::openmode which);
-#endif
// Filter member functions.
@@ -108,15 +104,13 @@
(stream_offset off, BOOST_IOS::seekdir way, BOOST_IOS::openmode which)
{ return boost::iostreams::seek(t_, off, way, which); }
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
- template<typename Mode, typename T>
- void mode_adapter<Mode, T>::close()
- { detail::close_all(t_); }
-
- template<typename Mode, typename T>
- void mode_adapter<Mode, T>::close(BOOST_IOS::openmode which)
- { iostreams::close(t_, which); }
-#endif
+template<typename Mode, typename T>
+void mode_adapter<Mode, T>::close()
+{ detail::close_all(t_); }
+
+template<typename Mode, typename T>
+void mode_adapter<Mode, T>::close(BOOST_IOS::openmode which)
+{ iostreams::close(t_, which); }
} } } // End namespaces detail, iostreams, boost.
Modified: trunk/boost/iostreams/detail/config/overload_resolution.hpp
==============================================================================
--- trunk/boost/iostreams/detail/config/overload_resolution.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/config/overload_resolution.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -21,8 +21,7 @@
#if !defined(BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION)
# if BOOST_WORKAROUND(__MWERKS__, <= 0x3003) || \
- BOOST_WORKAROUND(__BORLANDC__, < 0x600) || \
- BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
+ BOOST_WORKAROUND(__BORLANDC__, < 0x600) \
/**/
# define BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION
# endif
Modified: trunk/boost/iostreams/detail/default_arg.hpp
==============================================================================
--- trunk/boost/iostreams/detail/default_arg.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/default_arg.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -15,11 +15,7 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-# include <boost/mpl/identity.hpp>
-# define BOOST_IOSTREAMS_DEFAULT_ARG(arg) mpl::identity< arg >::type
-#else
-# define BOOST_IOSTREAMS_DEFAULT_ARG(arg) arg
-#endif
+// Obsolete. Remove.
+#define BOOST_IOSTREAMS_DEFAULT_ARG(arg) arg
#endif // #ifndef BOOST_IOSTREAMS_DETAIL_DEFAULT_ARG_HPP_INCLUDED
Modified: trunk/boost/iostreams/detail/forward.hpp
==============================================================================
--- trunk/boost/iostreams/detail/forward.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/forward.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -62,8 +62,14 @@
BOOST_IOSTREAMS_FORWARDING_FN, (class, impl, device) \
) \
/**/
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-# define BOOST_IOSTREAMS_FORWARDING_CTOR_I(z, n, tuple) \
+#define BOOST_IOSTREAMS_FORWARDING_CTOR(z, n, tuple) \
+ template<BOOST_PP_ENUM_PARAMS_Z(z, n, typename U)> \
+ BOOST_PP_TUPLE_ELEM(3, 0, tuple) \
+ (BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, const U, &u) \
+ BOOST_IOSTREAMS_DISABLE_IF_SAME(U0, BOOST_PP_TUPLE_ELEM(3, 2, tuple))) \
+ { this->BOOST_PP_TUPLE_ELEM(3, 1, tuple) \
+ ( BOOST_PP_TUPLE_ELEM(3, 2, tuple) \
+ (BOOST_PP_ENUM_PARAMS_Z(z, n, u)) ); } \
template< typename U100 BOOST_PP_COMMA_IF(BOOST_PP_DEC(n)) \
BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_DEC(n), typename U) > \
BOOST_PP_TUPLE_ELEM(3, 0, tuple) \
@@ -75,7 +81,13 @@
( u100 BOOST_PP_COMMA_IF(BOOST_PP_DEC(n)) \
BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_DEC(n), u)) ); } \
/**/
-# define BOOST_IOSTREAMS_FORWARDING_FN_I(z, n, tuple) \
+#define BOOST_IOSTREAMS_FORWARDING_FN(z, n, tuple) \
+ template<BOOST_PP_ENUM_PARAMS_Z(z, n, typename U)> \
+ void open(BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, const U, &u) \
+ BOOST_IOSTREAMS_DISABLE_IF_SAME(U0, BOOST_PP_TUPLE_ELEM(3, 2, tuple))) \
+ { this->BOOST_PP_TUPLE_ELEM(3, 1, tuple) \
+ ( BOOST_PP_TUPLE_ELEM(3, 2, tuple) \
+ (BOOST_PP_ENUM_PARAMS_Z(z, n, u)) ); } \
template< typename U100 BOOST_PP_COMMA_IF(BOOST_PP_DEC(n)) \
BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_DEC(n), typename U) > \
void open \
@@ -86,29 +98,6 @@
( u100 BOOST_PP_COMMA_IF(BOOST_PP_DEC(n)) \
BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_DEC(n), u) ); } \
/**/
-#else
-# define BOOST_IOSTREAMS_FORWARDING_CTOR_I(z, n, tuple)
-# define BOOST_IOSTREAMS_FORWARDING_FN_I(z, n, tuple)
-#endif
-#define BOOST_IOSTREAMS_FORWARDING_CTOR(z, n, tuple) \
- template<BOOST_PP_ENUM_PARAMS_Z(z, n, typename U)> \
- BOOST_PP_TUPLE_ELEM(3, 0, tuple) \
- (BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, const U, &u) \
- BOOST_IOSTREAMS_DISABLE_IF_SAME(U0, BOOST_PP_TUPLE_ELEM(3, 2, tuple))) \
- { this->BOOST_PP_TUPLE_ELEM(3, 1, tuple) \
- ( BOOST_PP_TUPLE_ELEM(3, 2, tuple) \
- (BOOST_PP_ENUM_PARAMS_Z(z, n, u)) ); } \
- BOOST_IOSTREAMS_FORWARDING_CTOR_I(z, n, tuple) \
- /**/
-#define BOOST_IOSTREAMS_FORWARDING_FN(z, n, tuple) \
- template<BOOST_PP_ENUM_PARAMS_Z(z, n, typename U)> \
- void open(BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, const U, &u) \
- BOOST_IOSTREAMS_DISABLE_IF_SAME(U0, BOOST_PP_TUPLE_ELEM(3, 2, tuple))) \
- { this->BOOST_PP_TUPLE_ELEM(3, 1, tuple) \
- ( BOOST_PP_TUPLE_ELEM(3, 2, tuple) \
- (BOOST_PP_ENUM_PARAMS_Z(z, n, u)) ); } \
- BOOST_IOSTREAMS_FORWARDING_FN_I(z, n, tuple) \
- /**/
// Disable forwarding constructors if first parameter type is the same
// as the device type
Modified: trunk/boost/iostreams/detail/ios.hpp
==============================================================================
--- trunk/boost/iostreams/detail/ios.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/ios.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -32,8 +32,7 @@
#ifndef BOOST_IOSTREAMS_NO_STREAM_TEMPLATES //--------------------------------//
# define BOOST_IOSTREAMS_BASIC_IOS(ch, tr) std::basic_ios< ch, tr >
# if !BOOST_WORKAROUND(__MWERKS__, <= 0x3003) && \
- !BOOST_WORKAROUND(__BORLANDC__, < 0x600) && \
- !BOOST_WORKAROUND(BOOST_MSVC, < 1300) \
+ !BOOST_WORKAROUND(__BORLANDC__, < 0x600) \
/**/
#define BOOST_IOS std::ios
Modified: trunk/boost/iostreams/detail/is_dereferenceable.hpp
==============================================================================
--- trunk/boost/iostreams/detail/is_dereferenceable.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/is_dereferenceable.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -39,8 +39,7 @@
// This is a last-resort operator* for when none other is found
tag operator*(any const&);
-# if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3202)) \
- || BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+# if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3202))
# define BOOST_comma(a,b) (a)
# else
// In case an operator++ is found that returns void, we'll use ++x,0
Modified: trunk/boost/iostreams/detail/is_iterator_range.hpp
==============================================================================
--- trunk/boost/iostreams/detail/is_iterator_range.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/is_iterator_range.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -17,8 +17,6 @@
namespace boost {
-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) //---------------------------------//
-
// We avoid dependence on Boost.Range by using a forward declaration.
template<typename Iterator>
class iterator_range;
@@ -29,19 +27,6 @@
} // End namespace iostreams.
-# else // # if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) //-----------------------//
-
-namespace iostreams {
-
- template<typename T>
- struct is_iterator_range {
- BOOST_STATIC_CONSTANT(bool, value = false);
- };
-
-} // End namespace iostreams.
-
-# endif // # if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) //----------------------//
-
} // End namespace boost.
#include <boost/iostreams/detail/config/enable_warnings.hpp>
Modified: trunk/boost/iostreams/detail/push.hpp
==============================================================================
--- trunk/boost/iostreams/detail/push.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/push.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -53,8 +53,7 @@
BOOST_IOSTREAMS_PUSH_ARGS() ); \
/**/
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && \
- !BOOST_WORKAROUND(__BORLANDC__, < 0x600) \
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x600) \
/**/
# ifndef BOOST_IOSTREAMS_NO_STREAM_TEMPLATES
# define BOOST_IOSTREAMS_DEFINE_PUSH_IMPL(name, mode, ch, helper, has_return, result) \
Modified: trunk/boost/iostreams/detail/resolve.hpp
==============================================================================
--- trunk/boost/iostreams/detail/resolve.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/resolve.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -32,9 +32,7 @@
#include <boost/mpl/and.hpp>
#include <boost/mpl/bool.hpp> // true_.
#include <boost/mpl/if.hpp>
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-# include <boost/range/iterator_range.hpp>
-#endif // #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+#include <boost/range/iterator_range.hpp>
#include <boost/type_traits/is_array.hpp>
// Must come last.
@@ -102,12 +100,10 @@
array_adapter<Mode, Ch> resolve(Ch (&array)[N])
{ return array_adapter<Mode, Ch>(array); }
-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
- template<typename Mode, typename Ch, typename Iter>
- range_adapter< Mode, boost::iterator_range<Iter> >
- resolve(const boost::iterator_range<Iter>& rng)
- { return range_adapter< Mode, boost::iterator_range<Iter> >(rng); }
-# endif // #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+template<typename Mode, typename Ch, typename Iter>
+range_adapter< Mode, boost::iterator_range<Iter> >
+resolve(const boost::iterator_range<Iter>& rng)
+{ return range_adapter< Mode, boost::iterator_range<Iter> >(rng); }
# else // # ifndef BOOST_IOSTREAMS_NO_STREAM_TEMPLATES //---------------------//
@@ -201,7 +197,6 @@
{ return resolve<Mode, Ch>(t, is_std_io<T>()); }
# if !BOOST_WORKAROUND(__BORLANDC__, < 0x600) && \
- !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && \
!defined(__GNUC__) // ---------------------------------------------------//
template<typename Mode, typename Ch, typename T>
@@ -225,7 +220,7 @@
resolve(T& t BOOST_IOSTREAMS_ENABLE_IF_STREAM(T))
{ return resolve<Mode, Ch>(t, is_std_io<T>()); }
-# endif // Borland 5.x, VC6-7.0 or GCC 2.9x //--------------------------------//
+# endif // Borland 5.x or GCC //--------------------------------//
#endif // #ifndef BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION //---------------//
} } } // End namespaces detail, iostreams, boost.
Modified: trunk/boost/iostreams/detail/restrict_impl.hpp
==============================================================================
--- trunk/boost/iostreams/detail/restrict_impl.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/restrict_impl.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -466,7 +466,6 @@
{ return BOOST_IOSTREAMS_RESTRICT(t, off, len, is_std_io<T>()); }
# if !BOOST_WORKAROUND(__BORLANDC__, < 0x600) && \
- !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && \
!defined(__GNUC__) // ---------------------------------------------------//
template<typename T>
@@ -474,7 +473,7 @@
BOOST_IOSTREAMS_RESTRICT(T& t, stream_offset off, stream_offset len = -1)
{ return restriction<T>(t, off, len); }
-# endif // Borland 5.x, VC6-7.0 or GCC 2.9x //-------------------------------//
+# endif // Borland 5.x or GCC //-------------------------------//
# endif // #ifndef BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION //--------------//
} } // End namespaces iostreams, boost.
Deleted: trunk/boost/iostreams/detail/vc6/close.hpp
==============================================================================
--- trunk/boost/iostreams/detail/vc6/close.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86078)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,129 +0,0 @@
-// (C) Copyright 2008 CodeRage, LLC (turkanis at coderage dot com)
-// (C) Copyright 2005-2007 Jonathan Turkanis
-// Distributed under 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.)
-
-// See http://www.boost.org/libs/iostreams for documentation.
-
-namespace boost { namespace iostreams {
-
-namespace detail {
-
-template<typename T>
-struct close_impl;
-
-} // End namespace detail.
-
-template<typename T>
-void close(T& t) { detail::close_all(t); }
-
-template<typename T>
-void close(T& t, BOOST_IOS::openmode which)
-{
- typedef typename detail::unwrapped_type<T>::type unwrapped;
- detail::close_impl<T>::inner<unwrapped>::close(detail::unwrap(t), which);
-}
-
-template<typename T, typename Sink>
-void close(T& t, Sink& snk, BOOST_IOS::openmode which)
-{
- typedef typename detail::unwrapped_type<T>::type unwrapped;
- detail::close_impl<T>::inner<unwrapped>::close(detail::unwrap(t), snk, which);
-}
-
-namespace detail {
-
-//------------------Definition of close_impl----------------------------------//
-
-template<typename T>
-struct close_tag {
- typedef typename category_of<T>::type category;
- typedef typename
- mpl::eval_if<
- is_convertible<category, closable_tag>,
- mpl::if_<
- mpl::or_<
- is_convertible<category, two_sequence>,
- is_convertible<category, dual_use>
- >,
- two_sequence,
- closable_tag
- >,
- mpl::identity<any_tag>
- >::type type;
-};
-
-template<typename T>
-struct close_impl
- : mpl::if_<
- is_custom<T>,
- operations<T>,
- close_impl<BOOST_DEDUCED_TYPENAME close_tag<T>::type>
- >::type
- { };
-
-template<>
-struct close_impl<any_tag> {
- template<typename T>
- struct inner {
- static void close(T& t, BOOST_IOS::openmode which)
- {
- if (which == BOOST_IOS::out)
- iostreams::flush(t);
- }
-
- template<typename Sink>
- static void close(T& t, Sink& snk, BOOST_IOS::openmode which)
- {
- if (which == BOOST_IOS::out) {
- non_blocking_adapter<Sink> nb(snk);
- iostreams::flush(t, nb);
- }
- }
- };
-};
-
-template<>
-struct close_impl<closable_tag> {
- template<typename T>
- struct inner {
- static void close(T& t, BOOST_IOS::openmode which)
- {
- typedef typename category_of<T>::type category;
- const bool in = is_convertible<category, input>::value &&
- !is_convertible<category, output>::value;
- if (in == (which == BOOST_IOS::in))
- t.close();
- }
- template<typename Sink>
- static void close(T& t, Sink& snk, BOOST_IOS::openmode which)
- {
- typedef typename category_of<T>::type category;
- const bool in = is_convertible<category, input>::value &&
- !is_convertible<category, output>::value;
- if (in == (which == BOOST_IOS::in)) {
- non_blocking_adapter<Sink> nb(snk);
- t.close(nb);
- }
- }
- };
-};
-
-template<>
-struct close_impl<two_sequence> {
- template<typename T>
- struct inner {
- static void close(T& t, BOOST_IOS::openmode which) { t.close(which); }
-
- template<typename Sink>
- static void close(T& t, Sink& snk, BOOST_IOS::openmode which)
- {
- non_blocking_adapter<Sink> nb(snk);
- t.close(nb, which);
- }
- };
-};
-
-} // End namespace detail.
-
-} } // End namespaces iostreams, boost.
Deleted: trunk/boost/iostreams/detail/vc6/read.hpp
==============================================================================
--- trunk/boost/iostreams/detail/vc6/read.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86078)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,238 +0,0 @@
-// (C) Copyright 2008 CodeRage, LLC (turkanis at coderage dot com)
-// (C) Copyright 2005-2007 Jonathan Turkanis
-// Distributed under 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.)
-
-// See http://www.boost.org/libs/iostreams for documentation.
-
-namespace boost { namespace iostreams {
-
-namespace detail {
-
-template<typename T>
-struct read_device_impl;
-
-template<typename T>
-struct read_filter_impl;
-
-} // End namespace detail.
-
-template<typename T>
-typename int_type_of<T>::type get(T& t)
-{
- typedef typename detail::unwrapped_type<T>::type unwrapped;
- return detail::read_device_impl<T>::inner<unwrapped>::get(detail::unwrap(t));
-}
-
-template<typename T>
-inline std::streamsize
-read(T& t, typename char_type_of<T>::type* s, std::streamsize n)
-{
- typedef typename detail::unwrapped_type<T>::type unwrapped;
- return detail::read_device_impl<T>::inner<unwrapped>::read(detail::unwrap(t), s, n);
-}
-
-template<typename T, typename Source>
-std::streamsize
-read(T& t, Source& src, typename char_type_of<T>::type* s, std::streamsize n)
-{
- typedef typename detail::unwrapped_type<T>::type unwrapped;
- return detail::read_filter_impl<T>::inner<unwrapped>::read(detail::unwrap(t), src, s, n);
-}
-
-template<typename T>
-bool putback(T& t, typename char_type_of<T>::type c)
-{
- typedef typename detail::unwrapped_type<T>::type unwrapped;
- return detail::read_device_impl<T>::inner<unwrapped>::putback(detail::unwrap(t), c);
-}
-
-//----------------------------------------------------------------------------//
-
-namespace detail {
-
-// Helper function for adding -1 as EOF indicator.
-inline std::streamsize check_eof(std::streamsize n) { return n != 0 ? n : -1; }
-
-// Helper templates for reading from streambufs.
-template<bool IsLinked>
-struct true_eof_impl;
-
-template<>
-struct true_eof_impl<true> {
- template<typename T>
- static bool true_eof(T& t) { return t.true_eof(); }
-};
-
-template<>
-struct true_eof_impl<false> {
- template<typename T>
- static bool true_eof(T& t) { return true; }
-};
-
-template<typename T>
-inline bool true_eof(T& t)
-{
- const bool linked = is_linked<T>::value;
- return true_eof_impl<linked>::true_eof(t);
-}
-
-//------------------Definition of read_device_impl----------------------------//
-
-template<typename T>
-struct read_device_impl
- : mpl::if_<
- detail::is_custom<T>,
- operations<T>,
- read_device_impl<
- BOOST_DEDUCED_TYPENAME
- detail::dispatch<
- T, istream_tag, streambuf_tag, input
- >::type
- >
- >::type
- { };
-
-template<>
-struct read_device_impl<istream_tag> {
- template<typename T>
- struct inner {
- static typename int_type_of<T>::type get(T& t)
- { return t.get(); }
-
- static std::streamsize
- read(T& t, typename char_type_of<T>::type* s, std::streamsize n)
- { return check_eof(t.rdbuf()->sgetn(s, n)); }
-
- static bool putback(T& t, typename char_type_of<T>::type c)
- {
- typedef typename char_type_of<T>::type char_type;
- typedef BOOST_IOSTREAMS_CHAR_TRAITS(char_type) traits_type;
- return !traits_type::eq_int_type( t.rdbuf()->sputbackc(c),
- traits_type::eof() );
- }
- };
-};
-
-template<>
-struct read_device_impl<streambuf_tag> {
- template<typename T>
- struct inner {
- static typename int_type_of<T>::type
- get(T& t)
- {
- typedef typename char_type_of<T>::type char_type;
- typedef char_traits<char_type> traits_type;
- typename int_type_of<T>::type c;
- return !traits_type::is_eof(c = t.sbumpc()) ||
- detail::true_eof(t)
- ?
- c : traits_type::would_block();
- }
-
- static std::streamsize
- read(T& t, typename char_type_of<T>::type* s, std::streamsize n)
- {
- std::streamsize amt;
- return (amt = t.sgetn(s, n)) != 0 ?
- amt :
- detail::true_eof(t) ?
- -1 :
- 0;
- }
-
- static bool putback(T& t, typename char_type_of<T>::type c)
- {
- typedef typename char_type_of<T>::type char_type;
- typedef char_traits<char_type> traits_type;
- return !traits_type::is_eof(t.sputbackc(c));
- }
- };
-};
-
-template<>
-struct read_device_impl<input> {
- template<typename T>
- struct inner {
- static typename int_type_of<T>::type
- get(T& t)
- {
- typedef typename char_type_of<T>::type char_type;
- typedef char_traits<char_type> traits_type;
- char_type c;
- std::streamsize amt;
- return (amt = t.read(&c, 1)) == 1 ?
- traits_type::to_int_type(c) :
- amt == -1 ?
- traits_type::eof() :
- traits_type::would_block();
- }
-
- template<typename T>
- static std::streamsize
- read(T& t, typename char_type_of<T>::type* s, std::streamsize n)
- { return t.read(s, n); }
-
- template<typename T>
- static bool putback(T& t, typename char_type_of<T>::type c)
- { // T must be Peekable.
- return t.putback(c);
- }
- };
-};
-
-//------------------Definition of read_filter_impl----------------------------//
-
-template<typename T>
-struct read_filter_impl
- : mpl::if_<
- detail::is_custom<T>,
- operations<T>,
- read_filter_impl<
- BOOST_DEDUCED_TYPENAME
- detail::dispatch<
- T, multichar_tag, any_tag
- >::type
- >
- >::type
- { };
-
-template<>
-struct read_filter_impl<multichar_tag> {
- template<typename T>
- struct inner {
- template<typename Source>
- static std::streamsize read
- ( T& t, Source& src, typename char_type_of<T>::type* s,
- std::streamsize n )
- { return t.read(src, s, n); }
- };
-};
-
-template<>
-struct read_filter_impl<any_tag> {
- template<typename T>
- struct inner {
- template<typename Source>
- static std::streamsize read
- ( T& t, Source& src, typename char_type_of<T>::type* s,
- std::streamsize n )
- {
- typedef typename char_type_of<T>::type char_type;
- typedef char_traits<char_type> traits_type;
- for (std::streamsize off = 0; off < n; ++off) {
- typename traits_type::int_type c = t.get(src);
- if (traits_type::is_eof(c))
- return check_eof(off);
- if (traits_type::would_block(c))
- return off;
- s[off] = traits_type::to_char_type(c);
- }
- return n;
- }
- };
-};
-
-} // End namespace detail.
-
-} } // End namespaces iostreams, boost.
Deleted: trunk/boost/iostreams/detail/vc6/write.hpp
==============================================================================
--- trunk/boost/iostreams/detail/vc6/write.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86078)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,159 +0,0 @@
-// (C) Copyright 2008 CodeRage, LLC (turkanis at coderage dot com)
-// (C) Copyright 2005-2007 Jonathan Turkanis
-// Distributed under 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.)
-
-// See http://www.boost.org/libs/iostreams for documentation.
-
-namespace boost { namespace iostreams {
-
-namespace detail {
-
-template<typename T>
-struct write_device_impl;
-
-template<typename T>
-struct write_filter_impl;
-
-} // End namespace detail.
-
-template<typename T>
-bool put(T& t, typename char_type_of<T>::type c)
-{
- typedef typename detail::unwrapped_type<T>::type unwrapped;
- return detail::write_device_impl<T>::inner<unwrapped>::put(detail::unwrap(t), c);
-}
-
-template<typename T>
-inline std::streamsize write
- (T& t, const typename char_type_of<T>::type* s, std::streamsize n)
-{
- typedef typename detail::unwrapped_type<T>::type unwrapped;
- return detail::write_device_impl<T>::inner<unwrapped>::write(detail::unwrap(t), s, n);
-}
-
-template<typename T, typename Sink>
-inline std::streamsize
-write( T& t, Sink& snk, const typename char_type_of<T>::type* s,
- std::streamsize n )
-{
- typedef typename detail::unwrapped_type<T>::type unwrapped;
- return detail::write_filter_impl<T>::inner<unwrapped>::write(detail::unwrap(t), snk, s, n);
-}
-
-namespace detail {
-
-//------------------Definition of write_device_impl---------------------------//
-
-template<typename T>
-struct write_device_impl
- : mpl::if_<
- is_custom<T>,
- operations<T>,
- write_device_impl<
- BOOST_DEDUCED_TYPENAME
- dispatch<
- T, ostream_tag, streambuf_tag, output
- >::type
- >
- >::type
- { };
-
-template<>
-struct write_device_impl<ostream_tag> {
- template<typename T>
- struct inner {
- static bool put(T& t, typename char_type_of<T>::type c)
- {
- typedef typename char_type_of<T>::type char_type;
- typedef BOOST_IOSTREAMS_CHAR_TRAITS(char_type) traits_type;
- return !traits_type::eq_int_type( t.rdbuf()->s.sputc(),
- traits_type::eof() );
- }
-
- static std::streamsize write
- (T& t, const typename char_type_of<T>::type* s, std::streamsize n)
- { return t.rdbuf()->sputn(s, n); }
- };
-};
-
-template<>
-struct write_device_impl<streambuf_tag> {
- template<typename T>
- struct inner {
- static bool put(T& t, typename char_type_of<T>::type c)
- {
- typedef typename char_type_of<T>::type char_type;
- typedef BOOST_IOSTREAMS_CHAR_TRAITS(char_type) traits_type;
- return !traits_type::eq_int_type(t.sputc(c), traits_type::eof());
- }
-
- template<typename T>
- static std::streamsize write
- (T& t, const typename char_type_of<T>::type* s, std::streamsize n)
- { return t.sputn(s, n); }
- };
-};
-
-template<>
-struct write_device_impl<output> {
- template<typename T>
- struct inner {
- static bool put(T& t, typename char_type_of<T>::type c)
- { return t.write(&c, 1) == 1; }
-
- template<typename T>
- static std::streamsize
- write(T& t, const typename char_type_of<T>::type* s, std::streamsize n)
- { return t.write(s, n); }
- };
-};
-
-//------------------Definition of write_filter_impl---------------------------//
-
-template<typename T>
-struct write_filter_impl
- : mpl::if_<
- is_custom<T>,
- operations<T>,
- write_filter_impl<
- BOOST_DEDUCED_TYPENAME
- dispatch<
- T, multichar_tag, any_tag
- >::type
- >
- >::type
- { };
-
-template<>
-struct write_filter_impl<multichar_tag> {
- template<typename T>
- struct inner {
- template<typename Sink>
- static std::streamsize
- write( T& t, Sink& snk, const typename char_type_of<T>::type* s,
- std::streamsize n )
- { return t.write(snk, s, n); }
- };
-};
-
-template<>
-struct write_filter_impl<any_tag> {
- template<typename T>
- struct inner {
- template<typename Sink>
- static std::streamsize
- write( T& t, Sink& snk, const typename char_type_of<T>::type* s,
- std::streamsize n )
- {
- for (std::streamsize off = 0; off < n; ++off)
- if (!t.put(snk, s[off]))
- return off;
- return n;
- }
- };
-};
-
-} // End namespace detail.
-
-} } // End namespaces iostreams, boost.
Modified: trunk/boost/iostreams/detail/wrap_unwrap.hpp
==============================================================================
--- trunk/boost/iostreams/detail/wrap_unwrap.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/detail/wrap_unwrap.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -83,8 +83,6 @@
//------------------Definition of unwrap--------------------------------------//
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310) //----------------------------------//
-
template<typename T>
typename unwrapped_type<T>::type&
unwrap(const reference_wrapper<T>& ref) { return ref.get(); }
@@ -95,33 +93,6 @@
template<typename T>
const typename unwrapped_type<T>::type& unwrap(const T& t) { return t; }
-#else // #if !BOOST_WORKAROUND(BOOST_MSVC, < 1310) //-------------------------//
-
-// Since unwrap is a potential bottleneck, we avoid runtime tag dispatch.
-template<bool IsRefWrap>
-struct unwrap_impl;
-
-template<>
-struct unwrap_impl<true> {
- template<typename T>
- static typename unwrapped_type<T>::type& unwrap(const T& t)
- { return t.get(); }
-};
-
-template<>
-struct unwrap_impl<false> {
- template<typename T>
- static typename unwrapped_type<T>::type& unwrap(const T& t)
- { return const_cast<T&>(t); }
-};
-
-template<typename T>
-typename unwrapped_type<T>::type&
-unwrap(const T& t)
-{ return unwrap_impl<is_reference_wrapper<T>::value>::unwrap(t); }
-
-#endif // #if !BOOST_WORKAROUND(BOOST_MSVC, < 1310) //------------------------//
-
} } } // End namespaces detail, iostreams, boost.
#endif // #ifndef BOOST_IOSTREAMS_DETAIL_WRAP_UNWRAP_HPP_INCLUDED
Modified: trunk/boost/iostreams/device/array.hpp
==============================================================================
--- trunk/boost/iostreams/device/array.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/device/array.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -40,12 +40,10 @@
array_adapter(char_type* begin, std::size_t length);
array_adapter(const char_type* begin, const char_type* end);
array_adapter(const char_type* begin, std::size_t length);
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
template<int N>
array_adapter(char_type (&ar)[N])
: begin_(ar), end_(ar + N)
{ }
-#endif
pair_type input_sequence();
pair_type output_sequence();
private:
@@ -55,16 +53,6 @@
} // End namespace detail.
-// Local macros, #undef'd below.
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-# define BOOST_IOSTREAMS_ARRAY_CTOR(name, ch) \
- template<int N> \
- BOOST_PP_CAT(basic_, name)(ch (&ar)[N]) \
- : base_type(ar) { } \
- /**/
-#else
-# define BOOST_IOSTREAMS_ARRAY_CTOR(name, ch)
-#endif
#define BOOST_IOSTREAMS_ARRAY(name, mode) \
template<typename Ch> \
struct BOOST_PP_CAT(basic_, name) : detail::array_adapter<mode, Ch> { \
@@ -81,7 +69,9 @@
: base_type(begin, end) { } \
BOOST_PP_CAT(basic_, name)(const char_type* begin, std::size_t length) \
: base_type(begin, length) { } \
- BOOST_IOSTREAMS_ARRAY_CTOR(name, Ch) \
+ template<int N> \
+ BOOST_PP_CAT(basic_, name)(Ch (&ar)[N]) \
+ : base_type(ar) { } \
}; \
typedef BOOST_PP_CAT(basic_, name)<char> name; \
typedef BOOST_PP_CAT(basic_, name)<wchar_t> BOOST_PP_CAT(w, name); \
@@ -89,7 +79,6 @@
BOOST_IOSTREAMS_ARRAY(array_source, input_seekable)
BOOST_IOSTREAMS_ARRAY(array_sink, output_seekable)
BOOST_IOSTREAMS_ARRAY(array, seekable)
-#undef BOOST_IOSTREAMS_ARRAY_CTOR
#undef BOOST_IOSTREAMS_ARRAY
Modified: trunk/boost/iostreams/filter/bzip2.hpp
==============================================================================
--- trunk/boost/iostreams/filter/bzip2.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/filter/bzip2.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -157,10 +157,8 @@
{
bool custom = bzip2_allocator<Alloc>::custom;
do_init( compress,
- #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
- custom ? bzip2_allocator<Alloc>::allocate : 0,
- custom ? bzip2_allocator<Alloc>::deallocate : 0,
- #endif
+ custom ? bzip2_allocator<Alloc>::allocate : 0,
+ custom ? bzip2_allocator<Alloc>::deallocate : 0,
custom ? &alloc : 0 );
}
void before( const char*& src_begin, const char* src_end,
@@ -172,10 +170,8 @@
void end(bool compress);
private:
void do_init( bool compress,
- #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
- bzip2::alloc_func,
- bzip2::free_func,
- #endif
+ bzip2::alloc_func,
+ bzip2::free_func,
void* derived );
bzip2_params params_;
void* stream_; // Actual type: bz_stream*.
Modified: trunk/boost/iostreams/filter/test.hpp
==============================================================================
--- trunk/boost/iostreams/filter/test.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/filter/test.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -15,8 +15,7 @@
#include <boost/detail/workaround.hpp>
#include <algorithm> // min.
#include <cstddef> // size_t.
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || \
- BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) || \
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) || \
BOOST_WORKAROUND(__MWERKS__, <= 0x3003) \
/**/
# include <cstdlib> // rand.
@@ -25,8 +24,7 @@
#include <iterator>
#include <string>
#include <vector>
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && \
- !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
!BOOST_WORKAROUND(__MWERKS__, <= 0x3003) \
/**/
# include <boost/random/linear_congruential.hpp>
@@ -52,8 +50,7 @@
namespace std {
using ::memcpy;
using ::strlen;
- #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || \
- BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) || \
+ #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) || \
BOOST_WORKAROUND(__MWERKS__, <= 0x3003) \
/**/
using ::rand;
@@ -67,8 +64,7 @@
const std::streamsize default_increment = 5;
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && \
- !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
!BOOST_WORKAROUND(__MWERKS__, <= 0x3003) \
/**/
std::streamsize rand(int inc)
Modified: trunk/boost/iostreams/filter/zlib.hpp
==============================================================================
--- trunk/boost/iostreams/filter/zlib.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/filter/zlib.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -183,10 +183,8 @@
{
bool custom = zlib_allocator<Alloc>::custom;
do_init( p, compress,
- #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
- custom ? zlib_allocator<Alloc>::allocate : 0,
- custom ? zlib_allocator<Alloc>::deallocate : 0,
- #endif
+ custom ? zlib_allocator<Alloc>::allocate : 0,
+ custom ? zlib_allocator<Alloc>::deallocate : 0,
&zalloc );
}
void before( const char*& src_begin, const char* src_end,
@@ -202,10 +200,8 @@
int total_out() const { return total_out_; }
private:
void do_init( const zlib_params& p, bool compress,
- #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
- zlib::xalloc_func,
- zlib::xfree_func,
- #endif
+ zlib::xalloc_func,
+ zlib::xfree_func,
void* derived );
void* stream_; // Actual type: z_stream*.
bool calculate_crc_;
Modified: trunk/boost/iostreams/pipeline.hpp
==============================================================================
--- trunk/boost/iostreams/pipeline.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/pipeline.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -20,9 +20,6 @@
#include <boost/preprocessor/punctuation/comma_if.hpp>
#include <boost/preprocessor/repetition/enum_params.hpp>
#include <boost/static_assert.hpp>
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-# include <boost/type_traits/is_base_and_derived.hpp>
-#endif
#define BOOST_IOSTREAMS_PIPABLE(filter, arity) \
template< BOOST_PP_ENUM_PARAMS(arity, typename T) \
@@ -50,14 +47,6 @@
namespace detail {
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
- struct pipeline_base { };
-
- template<typename T>
- struct is_pipeline
- : is_base_and_derived<pipeline_base, T>
- { };
-#endif
#if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
template<typename T>
struct is_pipeline : mpl::false_ { };
@@ -68,9 +57,6 @@
template<typename Component>
class pipeline_segment
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
- : pipeline_base
-#endif
{
public:
pipeline_segment(const Component& component)
Modified: trunk/boost/iostreams/read.hpp
==============================================================================
--- trunk/boost/iostreams/read.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/read.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -26,10 +26,6 @@
// Must come last.
#include <boost/iostreams/detail/config/disable_warnings.hpp>
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) //-----------------------------------//
-# include <boost/iostreams/detail/vc6/read.hpp>
-#else // #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) //--------------------------//
-
namespace boost { namespace iostreams {
namespace detail {
@@ -240,8 +236,6 @@
} } // End namespaces iostreams, boost.
-#endif // #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) //-------------------------//
-
#include <boost/iostreams/detail/config/enable_warnings.hpp>
#endif // #ifndef BOOST_IOSTREAMS_READ_HPP_INCLUDED
Modified: trunk/boost/iostreams/traits.hpp
==============================================================================
--- trunk/boost/iostreams/traits.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/traits.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -35,10 +35,8 @@
#include <boost/mpl/identity.hpp>
#include <boost/mpl/int.hpp>
#include <boost/mpl/or.hpp>
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-# include <boost/range/iterator_range.hpp>
-# include <boost/range/value_type.hpp>
-#endif // #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+#include <boost/range/iterator_range.hpp>
+#include <boost/range/value_type.hpp>
#include <boost/ref.hpp>
#include <boost/type_traits/is_convertible.hpp>
@@ -218,9 +216,7 @@
struct char_type_of {
template<typename U>
struct get_value_type {
- #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
- typedef typename range_value<U>::type type;
- #endif // #if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+ typedef typename range_value<U>::type type;
};
typedef typename
mpl::eval_if<
Modified: trunk/boost/iostreams/write.hpp
==============================================================================
--- trunk/boost/iostreams/write.hpp Mon Sep 30 12:02:26 2013 (r86078)
+++ trunk/boost/iostreams/write.hpp 2013-09-30 12:03:15 EDT (Mon, 30 Sep 2013) (r86079)
@@ -27,10 +27,6 @@
// Must come last.
#include <boost/iostreams/detail/config/disable_warnings.hpp>
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) //-----------------------------------//
-# include <boost/iostreams/detail/vc6/write.hpp>
-#else // #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) //--------------------------//
-
namespace boost { namespace iostreams {
namespace detail {
@@ -164,8 +160,6 @@
} } // End namespaces iostreams, boost.
-#endif // #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) //-------------------------//
-
#include <boost/iostreams/detail/config/enable_warnings.hpp>
#endif // #ifndef BOOST_IOSTREAMS_WRITE_HPP_INCLUDED
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