summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/proto/matches.hpp')
-rw-r--r--3rdParty/Boost/src/boost/proto/matches.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/proto/matches.hpp b/3rdParty/Boost/src/boost/proto/matches.hpp
index 38ff962..09bb4b9 100644
--- a/3rdParty/Boost/src/boost/proto/matches.hpp
+++ b/3rdParty/Boost/src/boost/proto/matches.hpp
@@ -11,71 +11,71 @@
#define BOOST_PROTO_MATCHES_HPP_EAN_11_03_2006
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/arithmetic/dec.hpp>
#include <boost/preprocessor/arithmetic/sub.hpp>
#include <boost/preprocessor/iteration/iterate.hpp>
#include <boost/preprocessor/facilities/intercept.hpp>
#include <boost/preprocessor/punctuation/comma_if.hpp>
#include <boost/preprocessor/repetition/enum.hpp>
#include <boost/preprocessor/repetition/enum_params.hpp>
#include <boost/preprocessor/repetition/enum_shifted.hpp>
#include <boost/preprocessor/repetition/enum_binary_params.hpp>
#include <boost/preprocessor/repetition/enum_shifted_params.hpp>
#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
#include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
#include <boost/preprocessor/repetition/repeat.hpp>
#include <boost/config.hpp>
#include <boost/mpl/logical.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/proto/detail/template_arity.hpp>
#include <boost/utility/enable_if.hpp>
#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
#include <boost/type_traits/is_array.hpp>
#endif
#include <boost/type_traits/is_const.hpp>
#include <boost/type_traits/is_convertible.hpp>
#include <boost/type_traits/is_reference.hpp>
#include <boost/type_traits/is_pointer.hpp>
#include <boost/proto/proto_fwd.hpp>
#include <boost/proto/traits.hpp>
#include <boost/proto/transform/when.hpp>
#include <boost/proto/transform/impl.hpp>
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable:4305) // 'specialization' : truncation from 'const int' to 'bool'
#endif
#define BOOST_PROTO_LOGICAL_typename_G BOOST_PP_ENUM_PARAMS(BOOST_PROTO_MAX_LOGICAL_ARITY, typename G)
#define BOOST_PROTO_LOGICAL_G BOOST_PP_ENUM_PARAMS(BOOST_PROTO_MAX_LOGICAL_ARITY, G)
namespace boost { namespace proto
{
namespace detail
{
template<typename Expr, typename BasicExpr, typename Grammar>
struct matches_;
template<bool B, typename Pred>
struct and_2;
template<typename And, typename Expr, typename State, typename Data>
struct _and_impl;
template<typename T, typename U>
struct array_matches
: mpl::false_
{};
template<typename T, std::size_t M>
struct array_matches<T[M], T *>
: mpl::true_
{};
template<typename T, std::size_t M>
struct array_matches<T[M], T const *>
: mpl::true_
{};
@@ -908,40 +908,40 @@ namespace boost { namespace proto
{};
/// INTERNAL ONLY
///
template<typename Grammar>
struct is_callable<not_<Grammar> >
: mpl::true_
{};
/// INTERNAL ONLY
///
template<typename If, typename Then, typename Else>
struct is_callable<if_<If, Then, Else> >
: mpl::true_
{};
/// INTERNAL ONLY
///
template<typename Grammar>
struct is_callable<vararg<Grammar> >
: mpl::true_
{};
/// INTERNAL ONLY
///
template<typename Cases, typename Transform>
struct is_callable<switch_<Cases, Transform> >
: mpl::true_
{};
}}
#undef BOOST_PROTO_LOGICAL_typename_G
#undef BOOST_PROTO_LOGICAL_G
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#endif