Imported Upstream version 1.72.0

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

diff --git a/boost/gil/io/make_dynamic_image_reader.hpp b/boost/gil/io/make_dynamic_image_reader.hpp
index dc1707a..8800698 100644 (file)
--- a/boost/gil/io/make_dynamic_image_reader.hpp
+++ b/boost/gil/io/make_dynamic_image_reader.hpp
@@ -8,10 +8,9 @@
 #ifndef BOOST_GIL_IO_MAKE_DYNAMIC_IMAGE_READER_HPP
 #define BOOST_GIL_IO_MAKE_DYNAMIC_IMAGE_READER_HPP
 
+#include <boost/gil/detail/mp11.hpp>
 #include <boost/gil/io/get_reader.hpp>
 
-#include <boost/mpl/and.hpp>
-
 #include <type_traits>
 
 namespace boost { namespace gil {
@@ -22,7 +21,7 @@ auto make_dynamic_image_reader(
     String const& file_name, image_read_settings<FormatTag> const& settings,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_supported_path_spec<String>,
             is_format_tag<FormatTag>
@@ -72,7 +71,7 @@ auto make_dynamic_image_reader(
     Device& file, image_read_settings<FormatTag> const& settings,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_adaptable_input_device<FormatTag, Device>,
             is_format_tag<FormatTag>
@@ -91,7 +90,7 @@ inline
 auto make_dynamic_image_reader(String const& file_name, FormatTag const&,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_supported_path_spec<String>,
             is_format_tag<FormatTag>
@@ -125,7 +124,7 @@ inline
 auto make_dynamic_image_reader(Device& file, FormatTag const&,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_adaptable_input_device<FormatTag, Device>,
             is_format_tag<FormatTag>