Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / gil / concepts / channel.hpp

diff --git a/boost/gil/concepts/channel.hpp b/boost/gil/concepts/channel.hpp
index 6cc125c..f26bd50 100644 (file)
--- a/boost/gil/concepts/channel.hpp
+++ b/boost/gil/concepts/channel.hpp
@@ -15,13 +15,14 @@
 #include <boost/concept_check.hpp>
 
 #include <utility> // std::swap
+#include <type_traits>
 
 #if defined(BOOST_CLANG)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-local-typedefs"
 #endif
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if defined(BOOST_GCC) && (BOOST_GCC >= 40900)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #endif
@@ -150,7 +151,7 @@ struct ChannelValueConcept
 /// \ingroup ChannelAlgorithm
 template <typename T1, typename T2>  // Models GIL Pixel
 struct channels_are_compatible
-    : is_same
+    : std::is_same
         <
             typename channel_traits<T1>::value_type,
             typename channel_traits<T2>::value_type
@@ -207,7 +208,7 @@ struct ChannelConvertibleConcept
 #pragma clang diagnostic pop
 #endif
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if defined(BOOST_GCC) && (BOOST_GCC >= 40900)
 #pragma GCC diagnostic pop
 #endif