import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / histogram / test / detail_iterator_adaptor_test.cpp

diff --git a/ceph/src/boost/libs/histogram/test/detail_iterator_adaptor_test.cpp b/ceph/src/boost/libs/histogram/test/detail_iterator_adaptor_test.cpp
index c7a3303dbbde4be0494df95d89b43e495128b31a..01d7681df914f275ce10fea2725f199a6ae4a9e7 100644 (file)
--- a/ceph/src/boost/libs/histogram/test/detail_iterator_adaptor_test.cpp
+++ b/ceph/src/boost/libs/histogram/test/detail_iterator_adaptor_test.cpp
@@ -9,14 +9,13 @@
 
 #include <boost/core/lightweight_test.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
-#include <boost/histogram/detail/detect.hpp>
 #include <boost/histogram/detail/iterator_adaptor.hpp>
-#include "std_ostream.hpp"
-#include "utility_iterator.hpp"
-
 #include <deque>
 #include <set>
+#include <type_traits>
 #include <vector>
+#include "std_ostream.hpp"
+#include "utility_iterator.hpp"
 
 using namespace boost::histogram;
 using boost::histogram::detail::iterator_adaptor;
@@ -48,7 +47,7 @@ public:
   ptr_iterator() {}
   ptr_iterator(V* d) : super_t(d) {}
 
-  template <class V2, class = detail::requires_convertible<V2*, V*>>
+  template <class V2, class = std::enable_if_t<std::is_convertible<V2*, V*>::value>>
   ptr_iterator(const ptr_iterator<V2>& x) : super_t(x.base()) {}
 
   V& operator*() const { return *(this->base()); }