summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/proto/extends.hpp')
-rw-r--r--3rdParty/Boost/src/boost/proto/extends.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/boost/proto/extends.hpp b/3rdParty/Boost/src/boost/proto/extends.hpp
index 47dca11..1fb0429 100644
--- a/3rdParty/Boost/src/boost/proto/extends.hpp
+++ b/3rdParty/Boost/src/boost/proto/extends.hpp
@@ -35,5 +35,5 @@
#include <boost/proto/detail/remove_typename.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
@@ -394,5 +394,5 @@ namespace boost { namespace proto
/**/
- #ifndef BOOST_NO_VARIADIC_TEMPLATES
+ #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#define BOOST_PROTO_EXTENDS_FUNCTION_CONST() \
BOOST_PROTO_EXTENDS_FUNCTION_() \
@@ -641,5 +641,5 @@ namespace boost { namespace proto
}}
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif