Imported Upstream version 1.72.0

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

diff --git a/boost/gil/io/write_view.hpp b/boost/gil/io/write_view.hpp
index 3519463..9ba7678 100644 (file)
--- a/boost/gil/io/write_view.hpp
+++ b/boost/gil/io/write_view.hpp
@@ -13,9 +13,7 @@
 #include <boost/gil/io/device.hpp>
 #include <boost/gil/io/get_writer.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>
 
@@ -27,7 +25,7 @@ inline
 void write_view(Writer& writer, View const& view,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename detail::is_writer<Writer>::type,
             typename is_format_tag<typename Writer::format_tag_t>::type,
@@ -48,7 +46,7 @@ inline
 void write_view(Device& device, View const& view, FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename detail::is_write_device<FormatTag, Device>::type,
             typename is_format_tag<FormatTag>::type,
@@ -71,7 +69,7 @@ inline
 void write_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,
@@ -95,7 +93,7 @@ void write_view(
     Device& device, View const& view, image_write_info<FormatTag, Log> const& info,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename detail::is_write_device<FormatTag, Device>::type,
             typename is_format_tag<FormatTag>::type,
@@ -119,7 +117,7 @@ void write_view(
     String const& file_name, View const& view, image_write_info<FormatTag, Log> const& info,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename detail::is_supported_path_spec<String>::type,
             typename is_format_tag<FormatTag>::type,
@@ -144,7 +142,7 @@ inline
 void write_view(Writer& writer, any_image_view<Views> const& view,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename detail::is_dynamic_image_writer<Writer>::type,
             typename is_format_tag<typename Writer::format_tag_t>::type
@@ -161,7 +159,7 @@ void write_view(
     Device& device, any_image_view<Views> const& views, FormatTag const& tag,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename detail::is_write_device<FormatTag, Device>::type,
             typename is_format_tag<FormatTag>::type
@@ -179,7 +177,7 @@ void write_view(
     String const& file_name, any_image_view<Views> const& views, 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
@@ -199,7 +197,7 @@ void write_view(
     Device& device, any_image_view<Views> const& views, image_write_info<FormatTag, Log> const& info,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename detail::is_write_device<FormatTag, Device>::type,
             typename is_format_tag<FormatTag>::type
@@ -217,7 +215,7 @@ void write_view(
     String const& file_name, any_image_view<Views> const& views, image_write_info<FormatTag, Log> const& info,
     typename std::enable_if
     <
-        mpl::and_
+        mp11::mp_and
         <
             typename detail::is_supported_path_spec<String>::type,
             typename is_format_tag<FormatTag>::type