Imported Upstream version 1.72.0

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

diff --git a/boost/gil/io/read_view.hpp b/boost/gil/io/read_view.hpp
index 6afef59..813dfa4 100644 (file)
--- a/boost/gil/io/read_view.hpp
+++ b/boost/gil/io/read_view.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>
 
@@ -33,7 +31,7 @@ inline
 void read_view(Reader reader, View const& view,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_reader<Reader>,
             typename is_format_tag<typename Reader::format_tag_t>::type,
@@ -63,7 +61,7 @@ void read_view(
     image_read_settings<FormatTag> const& settings,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             detail::is_read_device<FormatTag, Device>,
             typename is_format_tag<FormatTag>::type,
@@ -92,7 +90,7 @@ inline
 void read_view(Device& file, View const& view, FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename is_format_tag<FormatTag>::type,
             detail::is_read_device<FormatTag, Device>,
@@ -123,7 +121,7 @@ void read_view(
     image_read_settings<FormatTag> const& settings,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename detail::is_supported_path_spec<String>::type,
             typename is_format_tag<FormatTag>::type,
@@ -152,7 +150,7 @@ inline
 void read_view(String const& file_name, View const& view, FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename detail::is_supported_path_spec<String>::type,
             typename is_format_tag<FormatTag>::type,