Redefine GetSimpleTypeT<> in terms of <type_traits>

2 files changed, 3 insertions, 20 deletions

diff --git a/core/templates/command_queue_mt.h b/core/templates/command_queue_mt.h
index a4ac338bed..0c86bdb762 100644
--- a/core/templates/command_queue_mt.h
+++ b/core/templates/command_queue_mt.h
@@ -208,7 +208,7 @@
 #define ARG(N) p##N
 #define PARAM(N) P##N p##N
 #define TYPE_PARAM(N) typename P##N
-#define PARAM_DECL(N) typename GetSimpleTypeT<P##N>::type_t p##N
+#define PARAM_DECL(N) GetSimpleTypeT<P##N> p##N
 
 #define DECL_CMD(N)                                                          \
 	template <typename T, typename M COMMA(N) COMMA_SEP_LIST(TYPE_PARAM, N)> \
diff --git a/core/templates/simple_type.h b/core/templates/simple_type.h
index b2ae0110e2..197115ddb9 100644
--- a/core/templates/simple_type.h
+++ b/core/templates/simple_type.h
@@ -31,26 +31,9 @@
 #ifndef SIMPLE_TYPE_H
 #define SIMPLE_TYPE_H
 
-/* Batch of specializations to obtain the actual simple type */
+#include <type_traits>
 
 template <typename T>
-struct GetSimpleTypeT {
-	typedef T type_t;
-};
-
-template <typename T>
-struct GetSimpleTypeT<T &> {
-	typedef T type_t;
-};
-
-template <typename T>
-struct GetSimpleTypeT<T const> {
-	typedef T type_t;
-};
-
-template <typename T>
-struct GetSimpleTypeT<T const &> {
-	typedef T type_t;
-};
+using GetSimpleTypeT = typename std::remove_cv_t<std::remove_reference_t<T>>;
 
 #endif // SIMPLE_TYPE_H