Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / gil / io / read_and_convert_image.hpp

diff --git a/boost/gil/io/read_and_convert_image.hpp b/boost/gil/io/read_and_convert_image.hpp
index ef17a6a..c16763d 100644 (file)
--- a/boost/gil/io/read_and_convert_image.hpp
+++ b/boost/gil/io/read_and_convert_image.hpp
@@ -13,9 +13,7 @@
 #include <boost/gil/io/device.hpp>
 #include <boost/gil/io/get_reader.hpp>
 #include <boost/gil/io/path_spec.hpp>
-
-#include <boost/mpl/and.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
+#include <boost/gil/detail/mp11.hpp>
 
 #include <type_traits>
 
@@ -34,7 +32,7 @@ inline
 void read_and_convert_image(Reader& reader, Image& img,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_reader<Reader>,
             is_format_tag<typename Reader::format_tag_t>
@@ -60,7 +58,7 @@ void read_and_convert_image(
     ColorConverter const& cc,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_read_device<FormatTag, Device>,
             is_format_tag<FormatTag>
@@ -89,7 +87,7 @@ void read_and_convert_image(
     ColorConverter const& cc,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             is_format_tag<FormatTag>,
             detail::is_supported_path_spec<String>
@@ -118,7 +116,7 @@ void read_and_convert_image(
     FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             is_format_tag<FormatTag>,
             detail::is_supported_path_spec<String>
@@ -147,7 +145,7 @@ void read_and_convert_image(
     FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_read_device<FormatTag, Device>,
             is_format_tag<FormatTag>
@@ -173,7 +171,7 @@ inline void read_and_convert_image(
     image_read_settings<FormatTag> const& settings,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             is_format_tag<FormatTag>,
             detail::is_supported_path_spec<String>
@@ -199,7 +197,7 @@ inline void read_and_convert_image(
     image_read_settings<FormatTag> const& settings,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_read_device<FormatTag, Device>,
             is_format_tag<FormatTag>
@@ -226,7 +224,7 @@ void read_and_convert_image(
     FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             is_format_tag<FormatTag>,
             detail::is_supported_path_spec<String>
@@ -252,7 +250,7 @@ inline void read_and_convert_image(
     FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_read_device<FormatTag, Device>,
             is_format_tag<FormatTag>