Donated anonymously: This enables GCC 4.8.0 to build libc++.

llvm-svn: 173060

diff --git a/libcxx/include/functional b/libcxx/include/functional
index ec5c5e5..3bee1ed 100644 (file)
--- 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 f4e6fec..fa605e7 100644 (file)
--- 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: