From 1e4edc8addf7fc21d821e64cc81d85315561bcd9 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Wed, 12 Dec 2012 19:26:42 +0800
Subject: 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
---
 gcc-4.7/libstdc++-v3/include/std/type_traits | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc-4.7')

diff --git a/gcc-4.7/libstdc++-v3/include/std/type_traits b/gcc-4.7/libstdc++-v3/include/std/type_traits
index e3ec7ad5d..748469323 100644
--- a/gcc-4.7/libstdc++-v3/include/std/type_traits
+++ b/gcc-4.7/libstdc++-v3/include/std/type_traits
@@ -1746,7 +1746,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...>
-- 
cgit v1.2.3