[cfe-commits] [libcxx] r150599 - /libcxx/trunk/include/type_traits

[Howard Hinnant]

Author: hhinnant
Date: Wed Feb 15 12:08:09 2012
New Revision: 150599

URL: http://llvm.org/viewvc/llvm-project?rev=150599&view=rev
Log:
Another stab at fixing http://llvm.org/bugs/show_bug.cgi?id=12007.  I earlier missed that there are two common_type definitions and corrected only one of them.

Modified:
    libcxx/trunk/include/type_traits

Modified: libcxx/trunk/include/type_traits
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/type_traits?rev=150599&r1=150598&r2=150599&view=diff
==============================================================================
--- libcxx/trunk/include/type_traits (original)
+++ libcxx/trunk/include/type_traits Wed Feb 15 12:08:09 2012
@@ -1165,7 +1165,7 @@
     static _Up&& __u();
     static bool __f();
 public:
-    typedef decltype(__f() ? __t() : __u()) type;
+    typedef typename remove_reference<decltype(__f() ? __t() : __u())>::type type;
 };
 
 template <class _Tp, class _Up, class ..._Vp>