Imported Upstream version 1.72.0

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

diff --git a/boost/gil/concepts/pixel_locator.hpp b/boost/gil/concepts/pixel_locator.hpp
index 4ef610c..f27009f 100644 (file)
--- a/boost/gil/concepts/pixel_locator.hpp
+++ b/boost/gil/concepts/pixel_locator.hpp
@@ -11,6 +11,7 @@
 #include <boost/gil/concepts/basic.hpp>
 #include <boost/gil/concepts/concept_check.hpp>
 #include <boost/gil/concepts/fwd.hpp>
+#include <boost/gil/concepts/pixel.hpp>
 #include <boost/gil/concepts/pixel_dereference.hpp>
 #include <boost/gil/concepts/pixel_iterator.hpp>
 #include <boost/gil/concepts/point.hpp>
@@ -18,13 +19,14 @@
 
 #include <cstddef>
 #include <iterator>
+#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"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
@@ -140,12 +142,12 @@ struct RandomAccessNDLocatorConcept
         // have the same type as difference_type of the corresponding iterator
         gil_function_requires<PointNDConcept<point_t>>();
         static_assert(point_t::num_dimensions == N, "");
-        static_assert(is_same
+        static_assert(std::is_same
             <
                 typename std::iterator_traits<first_it_type>::difference_type,
                 typename point_t::template axis<0>::coord_t
             >::value, "");
-        static_assert(is_same
+        static_assert(std::is_same
             <
                 typename std::iterator_traits<last_it_type>::difference_type,
                 typename point_t::template axis<N-1>::coord_t
@@ -293,7 +295,7 @@ struct PixelLocatorConcept
         gil_function_requires<PixelIteratorConcept<typename Loc::x_iterator>>();
         gil_function_requires<PixelIteratorConcept<typename Loc::y_iterator>>();
         using coord_t = typename Loc::coord_t;
-        static_assert(is_same<typename Loc::x_coord_t, typename Loc::y_coord_t>::value, "");
+        static_assert(std::is_same<typename Loc::x_coord_t, typename Loc::y_coord_t>::value, "");
     }
     Loc loc;
 };
@@ -401,7 +403,7 @@ struct MutablePixelLocatorConcept
 #pragma clang diagnostic pop
 #endif
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if defined(BOOST_GCC) && (BOOST_GCC >= 40900)
 #pragma GCC diagnostic pop
 #endif