diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-02-15 18:08:09 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-02-15 18:08:09 +0000 |
| commit | 2aa9a38b6733adca0bd2d544cd42f5d8a1324f23 (patch) | |
| tree | 7f0344c7f87920de90241143490d7659af497364 | |
| parent | 0bc5132457a77e0db2e66f183342b8688f217ad8 (diff) | |
| download | bcm5719-llvm-2aa9a38b6733adca0bd2d544cd42f5d8a1324f23.tar.gz bcm5719-llvm-2aa9a38b6733adca0bd2d544cd42f5d8a1324f23.zip | |
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.
llvm-svn: 150599
| -rw-r--r-- | libcxx/include/type_traits | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index 2bf520a3fd8..bcad2acd8bc 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -1165,7 +1165,7 @@ private: 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> |
