import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / compute / algorithm / inplace_merge.hpp

diff --git a/ceph/src/boost/boost/compute/algorithm/inplace_merge.hpp b/ceph/src/boost/boost/compute/algorithm/inplace_merge.hpp
index 91f5be533507c33b941adc1b40dccd9bab467287..7ed91b7905ec1dd5e555731645406ead70bd19d2 100644 (file)
--- a/ceph/src/boost/boost/compute/algorithm/inplace_merge.hpp
+++ b/ceph/src/boost/boost/compute/algorithm/inplace_merge.hpp
@@ -13,10 +13,13 @@
 
 #include <iterator>
 
+#include <boost/static_assert.hpp>
+
 #include <boost/compute/system.hpp>
 #include <boost/compute/command_queue.hpp>
 #include <boost/compute/algorithm/merge.hpp>
 #include <boost/compute/container/vector.hpp>
+#include <boost/compute/type_traits/is_device_iterator.hpp>
 
 namespace boost {
 namespace compute {
@@ -31,6 +34,7 @@ inline void inplace_merge(Iterator first,
                           Iterator last,
                           command_queue &queue = system::default_queue())
 {
+    BOOST_STATIC_ASSERT(is_device_iterator<Iterator>::value);
     BOOST_ASSERT(first < middle && middle < last);
 
     typedef typename std::iterator_traits<Iterator>::value_type T;