Imported Upstream version 1.72.0

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

diff --git a/boost/gil/concepts/color.hpp b/boost/gil/concepts/color.hpp
index 80568fe..e2ac8a0 100644 (file)
--- a/boost/gil/concepts/color.hpp
+++ b/boost/gil/concepts/color.hpp
@@ -10,14 +10,14 @@
 
 #include <boost/gil/concepts/concept_check.hpp>
 
-#include <boost/type_traits.hpp>
+#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
@@ -29,7 +29,7 @@ namespace boost { namespace gil {
 /// \code
 /// concept ColorSpaceConcept<MPLRandomAccessSequence CS>
 /// {
-///    // An MPL Random Access Sequence, whose elements are color tags
+///    // Boost.MP11-compatible list, whose elements are color tags.
 /// };
 /// \endcode
 template <typename CS>
@@ -37,7 +37,7 @@ struct ColorSpaceConcept
 {
     void constraints()
     {
-        // An MPL Random Access Sequence, whose elements are color tags
+        // Boost.MP11-compatible list, whose elements are color tags
 
         // TODO: Is this incomplete?
     }
@@ -45,9 +45,7 @@ struct ColorSpaceConcept
 
 // Models ColorSpaceConcept
 template <typename CS1, typename CS2>
-struct color_spaces_are_compatible : is_same<CS1, CS2>
-{
-};
+struct color_spaces_are_compatible : std::is_same<CS1, CS2> {};
 
 /// \ingroup ColorSpaceAndLayoutConcept
 /// \brief Two color spaces are compatible if they are the same
@@ -71,7 +69,7 @@ struct ColorSpacesCompatibleConcept
 /// \code
 /// concept ChannelMappingConcept<MPLRandomAccessSequence CM>
 /// {
-///     // An MPL Random Access Sequence, whose elements
+///     // Boost.MP11-compatible list, whose elements
 ///     // model MPLIntegralConstant representing a permutation
 /// };
 /// \endcode
@@ -80,7 +78,7 @@ struct ChannelMappingConcept
 {
     void constraints()
     {
-        // An MPL Random Access Sequence, whose elements model
+        // Boost.MP11-compatible list, whose elements model
         // MPLIntegralConstant representing a permutation.
 
         // TODO: Is this incomplete?
@@ -93,7 +91,7 @@ struct ChannelMappingConcept
 #pragma clang diagnostic pop
 #endif
 
-#if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+#if defined(BOOST_GCC) && (BOOST_GCC >= 40900)
 #pragma GCC diagnostic pop
 #endif