Use std::enable_if rather than boost::enable_if

salilab · Mar 15, 2023 · 8024417 · 8024417
1 parent 8144eda
commit 8024417
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/include/RMF/Vector.h b/include/RMF/Vector.h
@@ -14,8 +14,7 @@
 #include "exceptions.h"
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/mpl/not.hpp>
+#include <type_traits>
 #include <array>
 #include <boost/static_assert.hpp>
 #include <algorithm>
@@ -39,15 +38,14 @@ class Vector
   struct Convert {};
 
   template <class R>
-  struct Convert<R, typename boost::enable_if<boost::is_convertible<
-                        R, std::array<float, D> > >::type> {
+  struct Convert<R, typename std::enable_if<std::is_convertible<
+                        R, std::array<float, D> >::value>::type> {
     static void convert(const R& r, std::array<float, D>& d) { d = r; }
   };
 
   template <class R>
-  struct Convert<
-      R, typename boost::enable_if<boost::mpl::not_<
-             boost::is_convertible<R, std::array<float, D> > > >::type> {
+  struct Convert<R, typename std::enable_if<!std::is_convertible<
+                        R, std::array<float, D> >::value>::type> {
     static void convert(const R& r, std::array<float, D>& d) {
       std::copy(boost::begin(r), boost::end(r), d.begin());
     }

diff --git a/swig/RMF_HDF5.i b/swig/RMF_HDF5.i
@@ -14,8 +14,7 @@ RMF_VC_PRAGMA(warning( disable: 4503 ))
 #include <boost/version.hpp>
 #include <boost/exception/all.hpp>
 
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <type_traits>
 #include <exception>
 
 #include "RMF/internal/swig_helpers.h"