summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2013-01-21 17:26:55 +0000
committerHoward Hinnant <hhinnant@apple.com>2013-01-21 17:26:55 +0000
commit8d3e7974442c748e67bce3011eb68fab873218c6 (patch)
tree9f1fabb50357b7f66c57a59261bb15f939f4a6de
parentc8a992f72718908108c25d17f03f0ae372662aa0 (diff)
downloadbcm5719-llvm-8d3e7974442c748e67bce3011eb68fab873218c6.tar.gz
bcm5719-llvm-8d3e7974442c748e67bce3011eb68fab873218c6.zip
Donated anonymously: This enables GCC 4.8.0 to build libc++.
llvm-svn: 173060
-rw-r--r--libcxx/include/functional2
-rw-r--r--libcxx/include/future2
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/functional b/libcxx/include/functional
index ec5c5e59333..3bee1ed1a0a 100644
--- a/libcxx/include/functional
+++ b/libcxx/include/functional
@@ -1088,7 +1088,7 @@ class _LIBCPP_VISIBLE function<_Rp(_ArgTypes...)>
public __function::__maybe_derive_from_binary_function<_Rp(_ArgTypes...)>
{
typedef __function::__base<_Rp(_ArgTypes...)> __base;
- aligned_storage<3*sizeof(void*)>::type __buf_;
+ typename aligned_storage<3*sizeof(void*)>::type __buf_;
__base* __f_;
template <class _Fp>
diff --git a/libcxx/include/future b/libcxx/include/future
index f4e6fec4f6c..fa605e7d07f 100644
--- a/libcxx/include/future
+++ b/libcxx/include/future
@@ -1757,7 +1757,7 @@ template<class _Rp, class ..._ArgTypes>
class __packaged_task_function<_Rp(_ArgTypes...)>
{
typedef __packaged_task_base<_Rp(_ArgTypes...)> __base;
- aligned_storage<3*sizeof(void*)>::type __buf_;
+ typename aligned_storage<3*sizeof(void*)>::type __buf_;
__base* __f_;
public:
OpenPOWER on IntegriCloud