Index: iostream.cpp
===================================================================
--- iostream.cpp	(revision 192551)
+++ iostream.cpp	(working copy)
@@ -10,43 +10,44 @@
 #include "__std_stream"
 #include "string"
 #include "new"
+#include "type_traits"
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 static mbstate_t state_types[6] = {};
 
-_ALIGNAS_TYPE (__stdinbuf<char> ) static char __cin [sizeof(__stdinbuf <char>)];
-_ALIGNAS_TYPE (__stdoutbuf<char>) static char __cout[sizeof(__stdoutbuf<char>)];
-_ALIGNAS_TYPE (__stdoutbuf<char>) static char __cerr[sizeof(__stdoutbuf<char>)];
-_ALIGNAS_TYPE (__stdinbuf<wchar_t> ) static char __wcin [sizeof(__stdinbuf <wchar_t>)];
-_ALIGNAS_TYPE (__stdoutbuf<wchar_t>) static char __wcout[sizeof(__stdoutbuf<wchar_t>)];
-_ALIGNAS_TYPE (__stdoutbuf<wchar_t>) static char __wcerr[sizeof(__stdoutbuf<wchar_t>)];
+static aligned_storage<sizeof(__stdinbuf <char>), __alignof__(__stdinbuf <char>)> __cin;
+static aligned_storage<sizeof(__stdoutbuf<char>), __alignof__(__stdoutbuf<char>)> __cout;
+static aligned_storage<sizeof(__stdoutbuf<char>), __alignof__(__stdoutbuf<char>)> __cerr;
+static aligned_storage<sizeof(__stdinbuf <wchar_t>), __alignof__(__stdinbuf <wchar_t>)> __wcin;
+static aligned_storage<sizeof(__stdoutbuf<wchar_t>), __alignof__(__stdoutbuf<wchar_t>)> __wcout;
+static aligned_storage<sizeof(__stdoutbuf<wchar_t>), __alignof__(__stdoutbuf<wchar_t>)> __wcerr;
 
-_ALIGNAS_TYPE (istream)  _LIBCPP_FUNC_VIS char cin [sizeof(istream)];
-_ALIGNAS_TYPE (ostream)  _LIBCPP_FUNC_VIS char cout[sizeof(ostream)];
-_ALIGNAS_TYPE (ostream)  _LIBCPP_FUNC_VIS char cerr[sizeof(ostream)];
-_ALIGNAS_TYPE (ostream)  _LIBCPP_FUNC_VIS char clog[sizeof(ostream)];
-_ALIGNAS_TYPE (wistream) _LIBCPP_FUNC_VIS char wcin [sizeof(wistream)];
-_ALIGNAS_TYPE (wostream) _LIBCPP_FUNC_VIS char wcout[sizeof(wostream)];
-_ALIGNAS_TYPE (wostream) _LIBCPP_FUNC_VIS char wcerr[sizeof(wostream)];
-_ALIGNAS_TYPE (wostream) _LIBCPP_FUNC_VIS char wclog[sizeof(wostream)];
+_LIBCPP_FUNC_VIS aligned_storage<sizeof(istream), __alignof__(istream)> cin;
+_LIBCPP_FUNC_VIS aligned_storage<sizeof(ostream), __alignof__(ostream)> cout;
+_LIBCPP_FUNC_VIS aligned_storage<sizeof(ostream), __alignof__(ostream)> cerr;
+_LIBCPP_FUNC_VIS aligned_storage<sizeof(ostream), __alignof__(ostream)> clog;
+_LIBCPP_FUNC_VIS aligned_storage<sizeof(wistream), __alignof__(wistream)> wcin;
+_LIBCPP_FUNC_VIS aligned_storage<sizeof(wostream), __alignof__(wostream)> wcout;
+_LIBCPP_FUNC_VIS aligned_storage<sizeof(wostream), __alignof__(wostream)> wcerr;
+_LIBCPP_FUNC_VIS aligned_storage<sizeof(wostream), __alignof__(wostream)> wclog;
 
 ios_base::Init __start_std_streams;
 
 ios_base::Init::Init()
 {
-    istream* cin_ptr  = ::new(cin)  istream(::new(__cin)  __stdinbuf <char>(stdin, state_types+0) );
-    ostream* cout_ptr = ::new(cout) ostream(::new(__cout) __stdoutbuf<char>(stdout, state_types+1));
-    ostream* cerr_ptr = ::new(cerr) ostream(::new(__cerr) __stdoutbuf<char>(stderr, state_types+2));
-                        ::new(clog) ostream(cerr_ptr->rdbuf());
+    istream* cin_ptr  = ::new(&cin)  istream(::new(&__cin)  __stdinbuf <char>(stdin, state_types+0) );
+    ostream* cout_ptr = ::new(&cout) ostream(::new(&__cout) __stdoutbuf<char>(stdout, state_types+1));
+    ostream* cerr_ptr = ::new(&cerr) ostream(::new(&__cerr) __stdoutbuf<char>(stderr, state_types+2));
+                        ::new(&clog) ostream(cerr_ptr->rdbuf());
     cin_ptr->tie(cout_ptr);
     _VSTD::unitbuf(*cerr_ptr);
     cerr_ptr->tie(cout_ptr);
 
-    wistream* wcin_ptr  = ::new(wcin)  wistream(::new(__wcin)  __stdinbuf <wchar_t>(stdin, state_types+3) );
-    wostream* wcout_ptr = ::new(wcout) wostream(::new(__wcout) __stdoutbuf<wchar_t>(stdout, state_types+4));
-    wostream* wcerr_ptr = ::new(wcerr) wostream(::new(__wcerr) __stdoutbuf<wchar_t>(stderr, state_types+5));
-                          ::new(wclog) wostream(wcerr_ptr->rdbuf());
+    wistream* wcin_ptr  = ::new(&wcin)  wistream(::new(&__wcin)  __stdinbuf <wchar_t>(stdin, state_types+3));
+    wostream* wcout_ptr = ::new(&wcout) wostream(::new(&__wcout) __stdoutbuf<wchar_t>(stdout, state_types+4));
+    wostream* wcerr_ptr = ::new(&wcerr) wostream(::new(&__wcerr) __stdoutbuf<wchar_t>(stderr, state_types+5));
+                          ::new(&wclog) wostream(wcerr_ptr->rdbuf());
     wcin_ptr->tie(wcout_ptr);
     _VSTD::unitbuf(*wcerr_ptr);
     wcerr_ptr->tie(wcout_ptr);
@@ -54,13 +55,13 @@
 
 ios_base::Init::~Init()
 {
-    ostream* cout_ptr = reinterpret_cast<ostream*>(cout);
-    ostream* clog_ptr = reinterpret_cast<ostream*>(clog);
+    ostream* cout_ptr = reinterpret_cast<ostream*>(&cout);
+    ostream* clog_ptr = reinterpret_cast<ostream*>(&clog);
     cout_ptr->flush();
     clog_ptr->flush();
 
-    wostream* wcout_ptr = reinterpret_cast<wostream*>(wcout);
-    wostream* wclog_ptr = reinterpret_cast<wostream*>(wclog);
+    wostream* wcout_ptr = reinterpret_cast<wostream*>(&wcout);
+    wostream* wclog_ptr = reinterpret_cast<wostream*>(&wclog);
     wcout_ptr->flush();
     wclog_ptr->flush();
 }