summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/proto/generate.hpp')
-rw-r--r--3rdParty/Boost/src/boost/proto/generate.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/proto/generate.hpp b/3rdParty/Boost/src/boost/proto/generate.hpp
index 92a47c4..4762741 100644
--- a/3rdParty/Boost/src/boost/proto/generate.hpp
+++ b/3rdParty/Boost/src/boost/proto/generate.hpp
@@ -1,62 +1,62 @@
///////////////////////////////////////////////////////////////////////////////
/// \file generate.hpp
/// Contains definition of generate\<\> class template, which end users can
/// specialize for generating domain-specific expression wrappers.
//
// Copyright 2008 Eric Niebler. 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)
#ifndef BOOST_PROTO_GENERATE_HPP_EAN_02_13_2007
#define BOOST_PROTO_GENERATE_HPP_EAN_02_13_2007
#include <boost/config.hpp>
#include <boost/version.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/iteration/iterate.hpp>
#include <boost/preprocessor/facilities/intercept.hpp>
#include <boost/preprocessor/repetition/enum_params.hpp>
#include <boost/preprocessor/repetition/enum_binary_params.hpp>
#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/proto/proto_fwd.hpp>
#include <boost/proto/args.hpp>
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 4714) // function 'xxx' marked as __forceinline not inlined
#endif
namespace boost { namespace proto
{
namespace detail
{
template<typename Expr>
struct by_value_generator_;
template<typename Tag, typename Arg>
struct by_value_generator_<proto::expr<Tag, term<Arg>, 0> >
{
typedef
proto::expr<
Tag
, term<typename detail::term_traits<Arg>::value_type>
, 0
>
type;
BOOST_FORCEINLINE
static type const call(proto::expr<Tag, term<Arg>, 0> const &e)
{
type that = {e.child0};
return that;
}
};
template<typename Tag, typename Arg>
struct by_value_generator_<proto::basic_expr<Tag, term<Arg>, 0> >
{
typedef
@@ -431,40 +431,40 @@ namespace boost
};
template<typename Expr>
struct result_of<proto::basic_default_generator(Expr)>
{
typedef Expr type;
};
#if BOOST_VERSION >= 104400
template<typename Expr>
struct tr1_result_of<proto::default_domain(Expr)>
{
typedef Expr type;
};
template<typename Expr>
struct tr1_result_of<proto::basic_default_domain(Expr)>
{
typedef Expr type;
};
template<typename Expr>
struct tr1_result_of<proto::default_generator(Expr)>
{
typedef Expr type;
};
template<typename Expr>
struct tr1_result_of<proto::basic_default_generator(Expr)>
{
typedef Expr type;
};
#endif
}
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#endif // BOOST_PROTO_GENERATE_HPP_EAN_02_13_2007