diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-12 19:26:42 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-12 19:26:42 +0800 |
| commit | 1e4edc8addf7fc21d821e64cc81d85315561bcd9 (patch) | |
| tree | af973be96467882e09f419050897ce3081121673 /gcc-4.6 | |
| parent | 7609f724df8ca390935f63243fa72e1de39d00c6 (diff) | |
| download | toolchain_gcc-1e4edc8addf7fc21d821e64cc81d85315561bcd9.tar.gz toolchain_gcc-1e4edc8addf7fc21d821e64cc81d85315561bcd9.tar.bz2 toolchain_gcc-1e4edc8addf7fc21d821e64cc81d85315561bcd9.zip | |
Patch GCC libstdc++ 4.4.3/4.6/4.7 to work with Clang in C++11
See http://clang.llvm.org/cxx_status.html
http://code.google.com/p/android/issues/detail?id=39600
https://android-review.googlesource.com/#/c/47836/
Change-Id: I1e625592dcc66fa952e0965bf86e8255cac6ca72
Diffstat (limited to 'gcc-4.6')
| -rw-r--r-- | gcc-4.6/libstdc++-v3/include/std/type_traits | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc-4.6/libstdc++-v3/include/std/type_traits b/gcc-4.6/libstdc++-v3/include/std/type_traits index 23611525b..f6b50047b 100644 --- a/gcc-4.6/libstdc++-v3/include/std/type_traits +++ b/gcc-4.6/libstdc++-v3/include/std/type_traits @@ -1110,7 +1110,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp, typename _Up> struct common_type<_Tp, _Up> - { typedef decltype(true ? declval<_Tp>() : declval<_Up>()) type; }; + { typedef typename decay<decltype(true ? declval<_Tp>() : declval<_Up>())>::type type; }; template<typename _Tp, typename _Up, typename... _Vp> struct common_type<_Tp, _Up, _Vp...> |