From 501b729cd4baea52a9f6f3b33401037541619793 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Wed, 19 Oct 2011 20:46:02 -0700
Subject: [PATCH] fix test_iostream

---
 src/library.js                | 9 +++++++--
 system/include/libcxx/ostream | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/library.js b/src/library.js
index 077fe0809..b099fd92a 100644
--- a/src/library.js
+++ b/src/library.js
@@ -4195,8 +4195,13 @@ LibraryManager.library = {
 
   // libc++
 
-  _ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEE6sentryC1ERS3___postset: 'try { __ZNSt3__14coutE = 1 } catch(e){}; try { __ZNSt3__14cerrE = 2 } catch(e){};',
-  _ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEE6sentryC1ERS3_: function(){},
+  $libcxx__postset: 'try { __ZNSt3__14coutE = 1 } catch(e){}; try { __ZNSt3__14cerrE = 2 } catch(e){};',
+  $libcxx: {},
+
+  _ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEElsEPKv__deps: ['fputs', '$libcxx'],
+  _ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEElsEPKv: function(stream, str) {
+    _fputs(str, _stdout); // XXX stderr etc.
+  },
 
   // glibc
 
diff --git a/system/include/libcxx/ostream b/system/include/libcxx/ostream
index f1a3de9c6..c70f3c156 100644
--- a/system/include/libcxx/ostream
+++ b/system/include/libcxx/ostream
@@ -204,6 +204,7 @@ protected:
     basic_ostream() {}  // extension, intentially does not initialize
 };
 
+/*
 template <class _CharT, class _Traits>
 class _LIBCPP_VISIBLE basic_ostream<_CharT, _Traits>::sentry
 {
@@ -1287,6 +1288,7 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const bitset<_Size>& __x)
 
 extern template class basic_ostream<char>;
 extern template class basic_ostream<wchar_t>;
+*/
 
 _LIBCPP_END_NAMESPACE_STD