ENH: Deprecated mpl::IsConvertible and the header which implements it

I did not find instances of it being used.
InsightSoftwareConsortium · Sep 13, 2021 · 2f29c8d · 2f29c8d
1 parent d458298
commit 2f29c8d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 38 deletions.
diff --git a/Documentation/ITK5MigrationGuide.md b/Documentation/ITK5MigrationGuide.md
@@ -82,6 +82,7 @@ To modernize your code base, replace:
   * `mpl::EnableIf<X>::Type` with `std::enable_if_t<X>`, and `#include "itkEnableIf.h"` with `#include <type_traits>`.
   * `mpl::IsSame<X, Y>::Value` with `std::is_same<X, Y>::value`, and `#include "itkIsSame.h"` with `#include <type_traits>`.
   * `mpl::IsBaseOf<X, Y>::Value` with `std::is_base_of<X, Y>::value`, and `#include "itkIsBaseOf.h"` with `#include <type_traits>`.
+  * `mpl::IsConvertible<X, Y>::Value` with `std::is_convertible<X, Y>::value`, and `#include "itkIsBaseOf.h"` with `#include <type_traits>`.
 
 
 Modern CMake requirement

diff --git a/Modules/Core/Common/include/itkIsConvertible.h b/Modules/Core/Common/include/itkIsConvertible.h
@@ -18,7 +18,11 @@
 #ifndef itkIsConvertible_h
 #define itkIsConvertible_h
 
-#include "itkMetaProgrammingLibrary.h"
+#include "itkMacro.h"
+
+#if !defined(ITK_LEGACY_REMOVE)
+
+#  include "itkMetaProgrammingLibrary.h"
 
 namespace itk
 {
@@ -79,4 +83,9 @@ using mpl::IsConvertible;
 /** \endcond */
 
 } // end namespace itk
+
+#else // ITK_LEGACY_REMOVE
+#  error Use C++ 11 std::is_convertible directly
+#endif
+
 #endif // itkIsConvertible_h
diff --git a/Modules/Core/Common/test/CMakeLists.txt b/Modules/Core/Common/test/CMakeLists.txt
@@ -121,7 +121,6 @@ itkMultiThreaderParallelizeArrayTest.cxx
 itkMultithreadingTest.cxx
 
 itkMetaProgrammingLibraryTest.cxx
-itkIsConvertible.cxx
 itkPromoteType.cxx
 itkMetaDataDictionaryTest.cxx
 itkStdStreamLogOutputTest.cxx

diff --git a/Modules/Core/Common/test/itkIsConvertible.cxx b/Modules/Core/Common/test/itkIsConvertible.cxx
diff --git a/Utilities/Maintenance/BuildHeaderTest.py b/Utilities/Maintenance/BuildHeaderTest.py
@@ -51,6 +51,7 @@
         "itkEnableIf.h", # Compatibility file, it should not be used
         "itkIsSame.h", # Compatibility file, it should not be used
         "itkIsBaseOf.h", # Compatibility file, it should not be used
+        "itkIsConvertible.h", # Compatibility file, it should not be used
         "itkViewImage.h",  # Depends on VTK_RENDERING_BACKEND
         "QuickView.h",  # Depends on VTK_RENDERING_BACKEND
         "itkBSplineDeformableTransformInitializer.h",