import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / gil / io / dynamic_io_new.hpp

diff --git a/ceph/src/boost/boost/gil/io/dynamic_io_new.hpp b/ceph/src/boost/boost/gil/io/dynamic_io_new.hpp
index 8a4981502757dc00fdb43f44f5f02fb1a9a919e3..3f529d90136d115d1227ea3fc04709f4f9f1d831 100644 (file)
--- a/ceph/src/boost/boost/gil/io/dynamic_io_new.hpp
+++ b/ceph/src/boost/boost/gil/io/dynamic_io_new.hpp
@@ -22,12 +22,12 @@ namespace detail {
 template <long N>
 struct construct_matched_t
 {
-    template <typename Images,typename Pred>
-    static bool apply(any_image<Images>& img, Pred pred)
+    template <typename ...Images,typename Pred>
+    static bool apply(any_image<Images...>& img, Pred pred)
     {
-        if (pred.template apply<mp11::mp_at_c<Images, N-1>>())
+        if (pred.template apply<mp11::mp_at_c<any_image<Images...>, N-1>>())
         {
-            using image_t = mp11::mp_at_c<Images, N-1>;
+            using image_t = mp11::mp_at_c<any_image<Images...>, N-1>;
             image_t x;
             img = std::move(x);
             return true;
@@ -39,8 +39,8 @@ struct construct_matched_t
 template <>
 struct construct_matched_t<0>
 {
-    template <typename Images,typename Pred>
-    static bool apply(any_image<Images>&,Pred) { return false; }
+    template <typename ...Images,typename Pred>
+    static bool apply(any_image<Images...>&,Pred) { return false; }
 };
 
 // A function object that can be passed to apply_operation.
@@ -92,10 +92,10 @@ public:
 
 /// \brief Within the any_image, constructs an image with the given dimensions
 ///        and a type that satisfies the given predicate
-template <typename Images,typename Pred>
-inline bool construct_matched(any_image<Images>& img, Pred pred)
+template <typename ...Images,typename Pred>
+inline bool construct_matched(any_image<Images...>& img, Pred pred)
 {
-    constexpr auto size = mp11::mp_size<Images>::value;
+    constexpr auto size = mp11::mp_size<any_image<Images...>>::value;
     return detail::construct_matched_t<size>::apply(img, pred);
 }