1 files changed, 5 insertions, 5 deletions
diff --git a/3rdParty/Boost/src/boost/type_traits/detail/has_binary_operator.hpp b/3rdParty/Boost/src/boost/type_traits/detail/has_binary_operator.hpp
index 9257bc2..d82a5ce 100644
--- a/3rdParty/Boost/src/boost/type_traits/detail/has_binary_operator.hpp
+++ b/3rdParty/Boost/src/boost/type_traits/detail/has_binary_operator.hpp
@@ -31,12 +31,12 @@
 // msvc:
 //    warning C4018: '<' : signed/unsigned mismatch
 //    warning C4244: '+=' : conversion from 'double' to 'char', possible loss of data
-//    warning C4547: '*' : operator before comma has no effect; expected operator with side-effect
+//    warning C4547: '*' : operator before comma has no effect; expected operator with side-effect
 //    warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
 //    warning C4804: '<' : unsafe use of type 'bool' in operation
 //    warning C4805: '==' : unsafe mix of type 'bool' and type 'char' in operation
 // cannot find another implementation -> declared as system header to suppress these warnings.
-#if defined(__GNUC__) && ((__GNUC__==3 && __GNUC_MINOR__>=1) || (__GNUC__>3))
+#if defined(__GNUC__)
 #   pragma GCC system_header
 #elif defined(BOOST_MSVC)
 #   pragma warning ( push )
@@ -152,10 +152,10 @@ no_operator operator,(no_operator, has_operator);
 
 template < typename Lhs, typename Rhs >
 struct operator_exists {
-   static ::boost::type_traits::yes_type check(has_operator); // this version is preferred when operator exists
-   static ::boost::type_traits::no_type check(no_operator); // this version is used otherwise
+   static ::boost::type_traits::yes_type s_check(has_operator); // this version is preferred when operator exists
+   static ::boost::type_traits::no_type s_check(no_operator); // this version is used otherwise
 
-   BOOST_STATIC_CONSTANT(bool, value = (sizeof(check(((make<Lhs>() BOOST_TT_TRAIT_OP make<Rhs>()),make<has_operator>())))==sizeof(::boost::type_traits::yes_type)));
+   BOOST_STATIC_CONSTANT(bool, value = (sizeof(s_check(((make<Lhs>() BOOST_TT_TRAIT_OP make<Rhs>()),make<has_operator>())))==sizeof(::boost::type_traits::yes_type)));
 };