diff options
Diffstat (limited to 'libstdc++-v3/include/std/type_traits')
| -rw-r--r-- | libstdc++-v3/include/std/type_traits | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 510b012a3e1..11f06c13e90 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1792,9 +1792,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct __do_common_type_impl { template<typename _Tp, typename _Up> - static __success_type<decltype + static __success_type<typename decay<decltype (true ? std::declval<_Tp>() - : std::declval<_Up>())> _S_test(int); + : std::declval<_Up>())>::type> _S_test(int); template<typename, typename> static __failure_type _S_test(...); @@ -1835,7 +1835,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp> struct common_type<_Tp> - { typedef _Tp type; }; + { typedef typename decay<_Tp>::type type; }; template<typename _Tp, typename _Up> struct common_type<_Tp, _Up> |