summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/proto/traits.hpp')
-rw-r--r--3rdParty/Boost/src/boost/proto/traits.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/boost/proto/traits.hpp b/3rdParty/Boost/src/boost/proto/traits.hpp
index cf9f091..f1a83fc 100644
--- a/3rdParty/Boost/src/boost/proto/traits.hpp
+++ b/3rdParty/Boost/src/boost/proto/traits.hpp
@@ -29,13 +29,13 @@
#include <boost/type_traits/add_const.hpp>
#include <boost/proto/proto_fwd.hpp>
#include <boost/proto/args.hpp>
#include <boost/proto/domain.hpp>
#include <boost/proto/transform/pass_through.hpp>
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(push)
# if BOOST_WORKAROUND( BOOST_MSVC, >= 1400 )
# pragma warning(disable: 4180) // warning C4180: qualifier applied to function type has no meaning; ignored
# endif
# pragma warning(disable : 4714) // function 'xxx' marked as __forceinline not inlined
#endif
@@ -1134,13 +1134,13 @@ namespace boost { namespace proto
return result_of::child_c<Expr const &, N>::call(e);
}
/// \brief Return the value stored within the specified Proto
/// terminal expression.
///
- /// Return the the value stored within the specified Proto
+ /// Return the value stored within the specified Proto
/// terminal expression. The value is returned by
/// reference.
///
/// \param expr The Proto terminal expression.
/// \pre <tt>N::value == 0</tt>
/// \throw nothrow
@@ -1248,11 +1248,11 @@ namespace boost { namespace proto
struct is_callable<functional::child<N> >
: mpl::true_
{};
}}
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#endif