diff options
| -rw-r--r-- | libstdc++-v3/include/std/type_traits | 17 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/remove_cvref/value.cc | 7 |
2 files changed, 20 insertions, 4 deletions
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 1f8b57b..eaf06fc 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -3223,12 +3223,21 @@ template <typename _From, typename _To> /// Remove references and cv-qualifiers. template<typename _Tp> struct remove_cvref - { - using type = __remove_cvref_t<_Tp>; - }; + : remove_cv<_Tp> + { }; + + template<typename _Tp> + struct remove_cvref<_Tp&> + : remove_cv<_Tp> + { }; + + template<typename _Tp> + struct remove_cvref<_Tp&&> + : remove_cv<_Tp> + { }; template<typename _Tp> - using remove_cvref_t = __remove_cvref_t<_Tp>; + using remove_cvref_t = typename remove_cvref<_Tp>::type; #define __cpp_lib_type_identity 201806L /// Identity metafunction. diff --git a/libstdc++-v3/testsuite/20_util/remove_cvref/value.cc b/libstdc++-v3/testsuite/20_util/remove_cvref/value.cc index d4a2842..a4f50d4 100644 --- a/libstdc++-v3/testsuite/20_util/remove_cvref/value.cc +++ b/libstdc++-v3/testsuite/20_util/remove_cvref/value.cc @@ -48,3 +48,10 @@ void test01() static_assert(is_same<typename remove_cvref<const int(&)()>::type, const int()>::value, ""); } + +// Declare using nested name of class template +template<typename T> T func(typename std::remove_cvref<T>::type); +// Define using alias +template<typename T> T func(std::remove_cvref_t<T> t) { return t; } +// Call must not be ambiguous +int i = func<int>(1); |