Subject: [Boost-commit] svn:boost r85950 - in trunk/boost/variant: . detail
From: steveire_at_[hidden]
Date: 2013-09-26 05:48:17
Author: skelly
Date: 2013-09-26 05:48:16 EDT (Thu, 26 Sep 2013)
New Revision: 85950
URL: http://svn.boost.org/trac/boost/changeset/85950
Log:
Variant: Remove obsolete MSVC version checks.
Text files modified:
trunk/boost/variant/detail/apply_visitor_binary.hpp | 4 -
trunk/boost/variant/detail/apply_visitor_unary.hpp | 4 -
trunk/boost/variant/detail/config.hpp | 1
trunk/boost/variant/detail/initializer.hpp | 38 +------------
trunk/boost/variant/get.hpp | 42 ---------------
trunk/boost/variant/recursive_variant.hpp | 2
trunk/boost/variant/static_visitor.hpp | 4 -
trunk/boost/variant/variant.hpp | 109 ---------------------------------------
8 files changed, 4 insertions(+), 200 deletions(-)
Modified: trunk/boost/variant/detail/apply_visitor_binary.hpp
==============================================================================
--- trunk/boost/variant/detail/apply_visitor_binary.hpp Thu Sep 26 05:47:54 2013 (r85949)
+++ trunk/boost/variant/detail/apply_visitor_binary.hpp 2013-09-26 05:48:16 EDT (Thu, 26 Sep 2013) (r85950)
@@ -156,8 +156,6 @@
// const-visitor version:
//
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-
template <typename Visitor, typename Visitable1, typename Visitable2>
inline
BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(
@@ -175,8 +173,6 @@
return boost::apply_visitor(unwrapper, visitable1);
}
-#endif // MSVC7 and below exclusion
-
} // namespace boost
#endif // BOOST_VARIANT_DETAIL_APPLY_VISITOR_BINARY_HPP
Modified: trunk/boost/variant/detail/apply_visitor_unary.hpp
==============================================================================
--- trunk/boost/variant/detail/apply_visitor_unary.hpp Thu Sep 26 05:47:54 2013 (r85949)
+++ trunk/boost/variant/detail/apply_visitor_unary.hpp 2013-09-26 05:48:16 EDT (Thu, 26 Sep 2013) (r85950)
@@ -66,8 +66,6 @@
// const-visitor version:
//
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-
template <typename Visitor, typename Visitable>
inline
BOOST_VARIANT_AUX_GENERIC_RESULT_TYPE(typename Visitor::result_type)
@@ -76,8 +74,6 @@
return visitable.apply_visitor(visitor);
}
-#endif // MSVC7 and below exclusion
-
} // namespace boost
#endif // BOOST_VARIANT_DETAIL_APPLY_VISITOR_UNARY_HPP
Modified: trunk/boost/variant/detail/config.hpp
==============================================================================
--- trunk/boost/variant/detail/config.hpp Thu Sep 26 05:47:54 2013 (r85949)
+++ trunk/boost/variant/detail/config.hpp 2013-09-26 05:48:16 EDT (Thu, 26 Sep 2013) (r85950)
@@ -21,7 +21,6 @@
//
#if BOOST_WORKAROUND(__MWERKS__, <= 0x3201) \
|| BOOST_WORKAROUND(BOOST_INTEL, <= 700) \
- || BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
&& !defined(BOOST_VARIANT_AUX_BROKEN_CONSTRUCTOR_TEMPLATE_ORDERING)
# define BOOST_VARIANT_AUX_BROKEN_CONSTRUCTOR_TEMPLATE_ORDERING
#endif
Modified: trunk/boost/variant/detail/initializer.hpp
==============================================================================
--- trunk/boost/variant/detail/initializer.hpp Thu Sep 26 05:47:54 2013 (r85949)
+++ trunk/boost/variant/detail/initializer.hpp 2013-09-26 05:48:16 EDT (Thu, 26 Sep 2013) (r85950)
@@ -152,12 +152,12 @@
#else // defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-
+ // Obsolete. Remove.
#define BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_PARAMS \
BOOST_VARIANT_ENUM_PARAMS(typename recursive_enabled_T) \
/**/
+ // Obsolete. Remove.
#define BOOST_VARIANT_AUX_PP_INITIALIZER_DEFINE_PARAM_T(N) \
typedef typename unwrap_recursive< \
BOOST_PP_CAT(recursive_enabled_T,N) \
@@ -167,18 +167,6 @@
>::param_type BOOST_PP_CAT(param_T,N); \
/**/
-# else // MSVC7 and below
-
- #define BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_PARAMS \
- BOOST_VARIANT_ENUM_PARAMS(typename recursive_enabled_T) \
- , BOOST_VARIANT_ENUM_PARAMS(typename param_T) \
- /**/
-
- #define BOOST_VARIANT_AUX_PP_INITIALIZER_DEFINE_PARAM_T(N) \
- /**/
-
-# endif // MSVC7 and below workaround
-
template < BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_PARAMS >
struct preprocessor_list_initializer
{
@@ -240,31 +228,11 @@
#else // defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-
- #define BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_ARGS(typename_base) \
- BOOST_VARIANT_ENUM_PARAMS(typename_base) \
- /**/
-
-# else // MSVC7 and below
-
- #define BOOST_VARIANT_AUX_PP_INITIALIZER_ENUM_PARAM_TYPE(z,N,T) \
- ::boost::call_traits< \
- ::boost::unwrap_recursive<BOOST_PP_CAT(T,N)>::type \
- >::param_type \
- /**/
-
+ // Obsolete. Remove.
#define BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_ARGS(typename_base) \
BOOST_VARIANT_ENUM_PARAMS(typename_base) \
- , BOOST_PP_ENUM( \
- BOOST_VARIANT_LIMIT_TYPES \
- , BOOST_VARIANT_AUX_PP_INITIALIZER_ENUM_PARAM_TYPE \
- , typename_base \
- ) \
/**/
-# endif // MSVC7 workaround
-
#define BOOST_VARIANT_AUX_INITIALIZER_T( mpl_seq, typename_base ) \
::boost::detail::variant::preprocessor_list_initializer< \
BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_ARGS(typename_base) \
Modified: trunk/boost/variant/get.hpp
==============================================================================
--- trunk/boost/variant/get.hpp Thu Sep 26 05:47:54 2013 (r85949)
+++ trunk/boost/variant/get.hpp 2013-09-26 05:48:16 EDT (Thu, 26 Sep 2013) (r85950)
@@ -24,12 +24,6 @@
#include "boost/type_traits/add_reference.hpp"
#include "boost/type_traits/add_pointer.hpp"
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-# include "boost/mpl/bool.hpp"
-# include "boost/mpl/or.hpp"
-# include "boost/type_traits/is_same.hpp"
-#endif
-
namespace boost {
//////////////////////////////////////////////////////////////////////////
@@ -78,8 +72,6 @@
public: // visitor interfaces
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
pointer operator()(reference operand) const
{
return boost::addressof(operand);
@@ -90,40 +82,6 @@
{
return static_cast<pointer>(0);
}
-
-#else // MSVC6
-
-private: // helpers, for visitor interfaces (below)
-
- pointer execute_impl(reference operand, mpl::true_) const
- {
- return boost::addressof(operand);
- }
-
- template <typename U>
- pointer execute_impl(const U& operand, mpl::false_) const
- {
- return static_cast<pointer>(0);
- }
-
-public: // visitor interfaces
-
- template <typename U>
- pointer operator()(U& operand) const
- {
- // MSVC6 finds normal implementation (above) ambiguous,
- // so we must explicitly disambiguate
-
- typedef typename mpl::or_<
- is_same<U, T>
- , is_same<const U, T>
- >::type U_is_T;
-
- return execute_impl(operand, U_is_T());
- }
-
-#endif // MSVC6 workaround
-
};
}} // namespace detail::variant
Modified: trunk/boost/variant/recursive_variant.hpp
==============================================================================
--- trunk/boost/variant/recursive_variant.hpp Thu Sep 26 05:47:54 2013 (r85949)
+++ trunk/boost/variant/recursive_variant.hpp 2013-09-26 05:48:16 EDT (Thu, 26 Sep 2013) (r85950)
@@ -194,9 +194,7 @@
{
private: // precondition assertions
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
BOOST_STATIC_ASSERT(( ::boost::mpl::is_sequence<Types>::value ));
-#endif
public: // metafunction result
Modified: trunk/boost/variant/static_visitor.hpp
==============================================================================
--- trunk/boost/variant/static_visitor.hpp Thu Sep 26 05:47:54 2013 (r85949)
+++ trunk/boost/variant/static_visitor.hpp 2013-09-26 05:48:16 EDT (Thu, 26 Sep 2013) (r85950)
@@ -19,10 +19,6 @@
#include "boost/mpl/if.hpp"
#include "boost/type_traits/is_base_and_derived.hpp"
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-# include "boost/type_traits/is_same.hpp"
-#endif
-
// should be the last #include
#include "boost/type_traits/detail/bool_trait_def.hpp"
Modified: trunk/boost/variant/variant.hpp
==============================================================================
--- trunk/boost/variant/variant.hpp Thu Sep 26 05:47:54 2013 (r85949)
+++ trunk/boost/variant/variant.hpp 2013-09-26 05:48:16 EDT (Thu, 26 Sep 2013) (r85950)
@@ -278,25 +278,10 @@
public: // metafunction result
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-
typedef ::boost::aligned_storage<
BOOST_MPL_AUX_VALUE_WKND(max_size)::value
, BOOST_MPL_AUX_VALUE_WKND(max_alignment)::value
> type;
-
-#else // MSVC7 and below
-
- BOOST_STATIC_CONSTANT(std::size_t, msvc_max_size_c = max_size::value);
- BOOST_STATIC_CONSTANT(std::size_t, msvc_max_alignment_c = max_alignment::value);
-
- typedef ::boost::aligned_storage<
- msvc_max_size_c
- , msvc_max_alignment_c
- > type;
-
-#endif // MSVC workaround
-
};
///////////////////////////////////////////////////////////////////////////////
@@ -337,8 +322,6 @@
: public static_visitor<T&>
{
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
public: // visitor interface
T& operator()(T& operand) const BOOST_NOEXCEPT
@@ -360,37 +343,6 @@
#if defined BOOST_MSVC
# pragma warning( pop )
#endif
-
-#else // MSVC6
-
-private: // helpers, for visitor interface (below)
-
- T& execute(T& operand, mpl::true_) const
- {
- return operand;
- }
-
- template <typename U>
- T& execute(U& operand, mpl::false_) const
- {
- // logical error to be here: see precondition above
- BOOST_ASSERT(false);
- return ::boost::detail::variant::forced_return< T& >();
- }
-
-public: // visitor interface
-
- template <typename U>
- T& operator()(U& operand) const
- {
- typedef typename is_same< U,T >::type
- U_is_T;
-
- return execute(operand, U_is_T());
- }
-
-#endif // MSVC6 workaround
-
};
///////////////////////////////////////////////////////////////////////////////
@@ -616,8 +568,6 @@
{
}
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
public: // visitor interface
bool operator()(T& lhs)
@@ -632,33 +582,6 @@
return false;
}
-#else // MSVC6
-
-private: // helpers, for visitor interface (below)
-
- bool execute(T& lhs, mpl::true_)
- {
- lhs = rhs_;
- return true;
- }
-
- template <typename U>
- bool execute(U&, mpl::false_)
- {
- return false;
- }
-
-public: // visitor interface
-
- template <typename U>
- bool operator()(U& lhs)
- {
- typedef typename is_same<U,T>::type U_is_T;
- return execute(lhs, U_is_T());
- }
-
-#endif // MSVC6 workaround
-
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
private:
// silence MSVC warning C4512: assignment operator could not be generated
@@ -688,8 +611,6 @@
{
}
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
public: // visitor interface
bool operator()(T& lhs)
@@ -704,19 +625,6 @@
return false;
}
-#else // MSVC6
-
-public: // visitor interface
-
- template <typename U>
- bool operator()(U& lhs)
- {
- // MSVC6 can not use direct_mover class
- return direct_assigner(rhs_)(lhs);
- }
-
-#endif // MSVC6 workaround
-
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1600))
private:
// silence MSVC warning C4512: assignment operator could not be generated
@@ -2251,23 +2159,10 @@
public: // prevent comparison with foreign types
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-
+// Obsolete. Remove.
# define BOOST_VARIANT_AUX_FAIL_COMPARISON_RETURN_TYPE \
void
-#else // MSVC7
-
- //
- // MSVC7 gives error about return types for above being different than
- // the true comparison operator overloads:
- //
-
-# define BOOST_VARIANT_AUX_FAIL_COMPARISON_RETURN_TYPE \
- bool
-
-#endif // MSVC7 workaround
-
template <typename U>
BOOST_VARIANT_AUX_FAIL_COMPARISON_RETURN_TYPE
operator==(const U&) const
@@ -2410,9 +2305,7 @@
{
private: // precondition assertions
-#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
BOOST_STATIC_ASSERT(( ::boost::mpl::is_sequence<Types>::value ));
-#endif
public: // metafunction result