summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/proto/transform')
-rw-r--r--3rdParty/Boost/src/boost/proto/transform/call.hpp4
-rw-r--r--3rdParty/Boost/src/boost/proto/transform/detail/pack.hpp4
-rw-r--r--3rdParty/Boost/src/boost/proto/transform/fold_tree.hpp4
-rw-r--r--3rdParty/Boost/src/boost/proto/transform/impl.hpp6
-rw-r--r--3rdParty/Boost/src/boost/proto/transform/make.hpp4
-rw-r--r--3rdParty/Boost/src/boost/proto/transform/pass_through.hpp4
-rw-r--r--3rdParty/Boost/src/boost/proto/transform/when.hpp4
7 files changed, 15 insertions, 15 deletions
diff --git a/3rdParty/Boost/src/boost/proto/transform/call.hpp b/3rdParty/Boost/src/boost/proto/transform/call.hpp
index 7d87c90..1e05011 100644
--- a/3rdParty/Boost/src/boost/proto/transform/call.hpp
+++ b/3rdParty/Boost/src/boost/proto/transform/call.hpp
@@ -9,7 +9,7 @@
#ifndef BOOST_PROTO_TRANSFORM_CALL_HPP_EAN_11_02_2007
#define BOOST_PROTO_TRANSFORM_CALL_HPP_EAN_11_02_2007
-#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
@@ -394,7 +394,7 @@ namespace boost { namespace proto
}} // namespace boost::proto
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
diff --git a/3rdParty/Boost/src/boost/proto/transform/detail/pack.hpp b/3rdParty/Boost/src/boost/proto/transform/detail/pack.hpp
index 863e7a0..20a8ce3 100644
--- a/3rdParty/Boost/src/boost/proto/transform/detail/pack.hpp
+++ b/3rdParty/Boost/src/boost/proto/transform/detail/pack.hpp
@@ -26,7 +26,7 @@
#include <boost/type_traits/is_same.hpp>
#include <boost/proto/proto_fwd.hpp>
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable: 4348) // redefinition of default parameter
#endif
@@ -90,7 +90,7 @@ namespace boost { namespace proto
}
}}
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
diff --git a/3rdParty/Boost/src/boost/proto/transform/fold_tree.hpp b/3rdParty/Boost/src/boost/proto/transform/fold_tree.hpp
index ace2c21..b541a15 100644
--- a/3rdParty/Boost/src/boost/proto/transform/fold_tree.hpp
+++ b/3rdParty/Boost/src/boost/proto/transform/fold_tree.hpp
@@ -69,7 +69,7 @@ namespace boost { namespace proto
/// template<typename Tag, typename Fun>
/// struct recurse_if_
/// : if_<
- /// // If the current node has type type "Tag" ...
+ /// // If the current node has type "Tag" ...
/// is_same<tag_of<_>, Tag>()
/// // ... recurse, otherwise ...
/// , fold<_, _state, recurse_if_<Tag, Fun> >
@@ -124,7 +124,7 @@ namespace boost { namespace proto
/// template<typename Tag, typename Fun>
/// struct recurse_if_
/// : if_<
- /// // If the current node has type type "Tag" ...
+ /// // If the current node has type "Tag" ...
/// is_same<tag_of<_>, Tag>()
/// // ... recurse, otherwise ...
/// , reverse_fold<_, _state, recurse_if_<Tag, Fun> >
diff --git a/3rdParty/Boost/src/boost/proto/transform/impl.hpp b/3rdParty/Boost/src/boost/proto/transform/impl.hpp
index 5cd538b..5490086 100644
--- a/3rdParty/Boost/src/boost/proto/transform/impl.hpp
+++ b/3rdParty/Boost/src/boost/proto/transform/impl.hpp
@@ -17,7 +17,7 @@
#include <boost/proto/detail/any.hpp>
#include <boost/proto/detail/static_const.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
@@ -75,7 +75,7 @@ namespace boost { namespace proto
: is_env<T>
{};
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
/// INTERNAL ONLY
///
@@ -345,7 +345,7 @@ namespace boost { namespace proto
}} // namespace boost::proto
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
diff --git a/3rdParty/Boost/src/boost/proto/transform/make.hpp b/3rdParty/Boost/src/boost/proto/transform/make.hpp
index 140ca1d..5652543 100644
--- a/3rdParty/Boost/src/boost/proto/transform/make.hpp
+++ b/3rdParty/Boost/src/boost/proto/transform/make.hpp
@@ -33,7 +33,7 @@
#include <boost/proto/detail/as_lvalue.hpp>
#include <boost/proto/detail/ignore_unused.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
@@ -277,7 +277,7 @@ namespace boost { namespace proto
}}
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
diff --git a/3rdParty/Boost/src/boost/proto/transform/pass_through.hpp b/3rdParty/Boost/src/boost/proto/transform/pass_through.hpp
index 9c43008..bdd152e 100644
--- a/3rdParty/Boost/src/boost/proto/transform/pass_through.hpp
+++ b/3rdParty/Boost/src/boost/proto/transform/pass_through.hpp
@@ -24,7 +24,7 @@
#include <boost/proto/transform/impl.hpp>
#include <boost/proto/detail/ignore_unused.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
@@ -138,7 +138,7 @@ namespace boost { namespace proto
}} // namespace boost::proto
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
diff --git a/3rdParty/Boost/src/boost/proto/transform/when.hpp b/3rdParty/Boost/src/boost/proto/transform/when.hpp
index d1defb8..78ffa9e 100644
--- a/3rdParty/Boost/src/boost/proto/transform/when.hpp
+++ b/3rdParty/Boost/src/boost/proto/transform/when.hpp
@@ -24,7 +24,7 @@
#include <boost/proto/transform/impl.hpp>
#include <boost/proto/transform/env.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
@@ -260,7 +260,7 @@ namespace boost { namespace proto
}} // namespace boost::proto
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif