From c417a802edd2cc604a2375c0c1ddf0f944196c32 Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Sun, 26 Aug 2012 18:05:35 +0000 Subject: [PATCH] Hyeon-bin Jeong: libc++ fails to create any classes inherit from basic_ios if they provided char type other than char or wchar_t. It throw exception during construction, so there is no chance to imbue own ctype. This fixes http://llvm.org/bugs/show_bug.cgi?id=13698 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@162648 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/ios | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/ios b/include/ios index e7a50949..d02651b8 100644 --- a/include/ios +++ b/include/ios @@ -637,7 +637,7 @@ protected: void set_rdbuf(basic_streambuf* __sb); private: basic_ostream* __tie_; - char_type __fill_; + mutable int_type __fill_; }; template @@ -659,7 +659,7 @@ basic_ios<_CharT, _Traits>::init(basic_streambuf* __sb) { ios_base::init(__sb); __tie_ = 0; - __fill_ = widen(' '); + __fill_ = traits_type::eof(); } template @@ -731,6 +731,8 @@ inline _LIBCPP_INLINE_VISIBILITY _CharT basic_ios<_CharT, _Traits>::fill() const { + if (traits_type::eq_int_type(traits_type::eof(), __fill_)) + __fill_ = widen(' '); return __fill_; }