8299395: Remove metaprogramming/removeCV.hpp

Reviewed-by: kbarrett, tschatzl
openjdk · Jan 3, 2023 · 8afd665 · 8afd665 · openjdk-notifier · Jan 3, 2023
1 parent 3757433
commit 8afd665
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 134 deletions.
diff --git a/src/hotspot/share/metaprogramming/decay.hpp b/src/hotspot/share/metaprogramming/decay.hpp
@@ -26,16 +26,17 @@
 #define SHARE_METAPROGRAMMING_DECAY_HPP
 
 #include "memory/allStatic.hpp"
-#include "metaprogramming/removeCV.hpp"
 #include "metaprogramming/removeReference.hpp"
 
+#include <type_traits>
+
 // This trait trims the type from CV qualifiers and references.
 // This trait provides a subset of the functionality of std::decay;
 // array types and function types are not supported here.
 
 template <typename T>
 struct Decay: AllStatic {
-  typedef typename RemoveCV<typename RemoveReference<T>::type>::type type;
+  using type = std::remove_cv_t<typename RemoveReference<T>::type>;
 };
 
 #endif // SHARE_METAPROGRAMMING_DECAY_HPP
diff --git a/src/hotspot/share/metaprogramming/isIntegral.hpp b/src/hotspot/share/metaprogramming/isIntegral.hpp
@@ -28,15 +28,16 @@
 
 #include "metaprogramming/integralConstant.hpp"
 #include "metaprogramming/isSigned.hpp"
-#include "metaprogramming/removeCV.hpp"
+
 #include <limits>
+#include <type_traits>
 
 // This metafunction returns true iff the type T (irrespective of CV qualifiers)
 // is an integral type. Note that this is false for enums.
 
 template<typename T>
 struct IsIntegral
-  : public IntegralConstant<bool, std::numeric_limits<typename RemoveCV<T>::type>::is_integer>
+  : public IntegralConstant<bool, std::numeric_limits<typename std::remove_cv<T>::type>::is_integer>
 {};
 
 // This metafunction returns true iff the type T (irrespective of CV qualifiers)

diff --git a/src/hotspot/share/metaprogramming/isSigned.hpp b/src/hotspot/share/metaprogramming/isSigned.hpp
@@ -26,12 +26,13 @@
 #define SHARE_METAPROGRAMMING_ISSIGNED_HPP
 
 #include "metaprogramming/integralConstant.hpp"
-#include "metaprogramming/removeCV.hpp"
+
 #include <limits>
+#include <type_traits>
 
 template<typename T>
 struct IsSigned
-  : public IntegralConstant<bool, std::numeric_limits<typename RemoveCV<T>::type>::is_signed>
+  : public IntegralConstant<bool, std::numeric_limits<typename std::remove_cv<T>::type>::is_signed>
 {};
 
 #endif // SHARE_METAPROGRAMMING_ISSIGNED_HPP
diff --git a/src/hotspot/share/metaprogramming/removeCV.hpp b/src/hotspot/share/metaprogramming/removeCV.hpp
diff --git a/src/hotspot/share/runtime/atomic.hpp b/src/hotspot/share/runtime/atomic.hpp
@@ -32,12 +32,12 @@
 #include "metaprogramming/isPointer.hpp"
 #include "metaprogramming/isSame.hpp"
 #include "metaprogramming/primitiveConversions.hpp"
-#include "metaprogramming/removeCV.hpp"
 #include "metaprogramming/removePointer.hpp"
 #include "runtime/orderAccess.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bytes.hpp"
 #include "utilities/macros.hpp"
+
 #include <type_traits>
 
 enum atomic_memory_order {
@@ -794,8 +794,8 @@ template<typename D, typename U, typename T>
 struct Atomic::CmpxchgImpl<
   D*, U*, T*,
   typename EnableIf<Atomic::IsPointerConvertible<T*, D*>::value &&
-                    IsSame<typename RemoveCV<D>::type,
-                           typename RemoveCV<U>::type>::value>::type>
+                    IsSame<std::remove_cv_t<D>,
+                           std::remove_cv_t<U>>::value>::type>
 {
   D* operator()(D* volatile* dest, U* compare_value, T* exchange_value,
                atomic_memory_order order) const {

diff --git a/test/hotspot/gtest/metaprogramming/test_removeCV.cpp b/test/hotspot/gtest/metaprogramming/test_removeCV.cpp