|
|
|
@ -1,4 +1,29 @@
|
|
|
|
|
2018-04-10 Jonathan Wakely <jwakely@redhat.com>
|
|
|
|
|
2018-04-18 Jonathan Wakely <jwakely@redhat.com>
|
|
|
|
|
Jakub Jelinek <jakub@redhat.com>
|
|
|
|
|
|
|
|
|
|
PR libstdc++/85442
|
|
|
|
|
* src/c++11/Makefile.am: Don't generate debuginfo again for
|
|
|
|
|
cxx11-ios_failure-lt.s and cxx11-ios_failure.s files.
|
|
|
|
|
* src/c++11/Makefile.in: Regenerate.
|
|
|
|
|
|
|
|
|
|
2018-04-13 Jonathan Wakely <jwakely@redhat.com>
|
|
|
|
|
|
|
|
|
|
* src/c++11/Makefile.am: Fix sed command.
|
|
|
|
|
* src/c++11/Makefile.in: Regenerate.
|
|
|
|
|
|
|
|
|
|
* src/c++11/Makefile.am: Rewrite sed rule to be less fragile and to
|
|
|
|
|
handle mangled names starting with double underscores on darwin.
|
|
|
|
|
* src/c++11/Makefile.in: Regenerate.
|
|
|
|
|
|
|
|
|
|
2018-04-12 Jonathan Wakely <jwakely@redhat.com>
|
|
|
|
|
|
|
|
|
|
* src/c++11/Makefile.am: Fix comment.
|
|
|
|
|
* src/c++11/Makefile.in: Regenerate.
|
|
|
|
|
* src/c++11/cxx11-ios_failure.cc: Fix comment.
|
|
|
|
|
* src/c++98/ios_failure.cc: Likewise.
|
|
|
|
|
|
|
|
|
|
Backport from mainline
|
|
|
|
|
2018-04-10 Jonathan Wakely <jwakely@redhat.com>
|
|
|
|
|
|
|
|
|
|
PR libstdc++/85222
|
|
|
|
|
* src/c++11/Makefile.am [ENABLE_DUAL_ABI]: Add special rules for
|
|
|
|
@ -8,6 +33,7 @@
|
|
|
|
|
New types.
|
|
|
|
|
[_GLIBCXX_USE_DUAL_ABI] (__throw_ios_failure): Define here.
|
|
|
|
|
* src/c++11/ios.cc (__throw_ios_failure): Remove definition.
|
|
|
|
|
(_GLIBCXX_USE_CXX11_ABI): Don't define here.
|
|
|
|
|
* src/c++98/ios_failure.cc (__construct_ios_failure)
|
|
|
|
|
(__destroy_ios_failure, is_ios_failure_handler): New functions.
|
|
|
|
|
[!_GLIBCXX_USE_DUAL_ABI] (__throw_ios_failure): Define here.
|
|
|
|
@ -33,8 +59,8 @@
|
|
|
|
|
|
|
|
|
|
Index: libstdc++-v3/src/c++98/ios_failure.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/src/c++98/ios_failure.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/src/c++98/ios_failure.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/src/c++98/ios_failure.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/src/c++98/ios_failure.cc (working copy)
|
|
|
|
|
@@ -29,6 +29,18 @@
|
|
|
|
|
#define _GLIBCXX_USE_CXX11_ABI 0
|
|
|
|
|
#include <ios>
|
|
|
|
@ -60,7 +86,7 @@ Index: libstdc++-v3/src/c++98/ios_failure.cc
|
|
|
|
|
|
|
|
|
|
+#if _GLIBCXX_USE_DUAL_ABI
|
|
|
|
|
+ // When the dual ABI is enabled __throw_ios_failure() is defined in
|
|
|
|
|
+ // src/c++11/ios_failure.cc
|
|
|
|
|
+ // src/c++11/cxx11-ios_failure.cc
|
|
|
|
|
+#if __cpp_rtti
|
|
|
|
|
+ // If RTTI is enabled the exception type thrown will use these functions to
|
|
|
|
|
+ // construct/destroy a gcc4-compatible ios::failure object in a buffer,
|
|
|
|
@ -97,23 +123,19 @@ Index: libstdc++-v3/src/c++98/ios_failure.cc
|
|
|
|
|
} // namespace
|
|
|
|
|
Index: libstdc++-v3/src/c++11/Makefile.in
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/src/c++11/Makefile.in (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/src/c++11/Makefile.in (revision 259281)
|
|
|
|
|
@@ -434,6 +434,13 @@ sources = \
|
|
|
|
|
--- libstdc++-v3/src/c++11/Makefile.in (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/src/c++11/Makefile.in (working copy)
|
|
|
|
|
@@ -433,6 +433,9 @@ sources = \
|
|
|
|
|
|
|
|
|
|
libc__11convenience_la_SOURCES = $(sources) $(inst_sources)
|
|
|
|
|
|
|
|
|
|
+# Rewrite the type info for __dual_abi_ios_failure.
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@rewrite_ios_failure_typeinfo = sed -e '/^_ZTISt13__ios_failure:$$/{' \
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@ -e 'n' \
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@ -e 's/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/' \
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@ -e '}'
|
|
|
|
|
+
|
|
|
|
|
+# Rewrite the type info for __ios_failure.
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@rewrite_ios_failure_typeinfo = sed -e '/^_*_ZTISt13__ios_failure:/,/_ZTVN10__cxxabiv120__si_class_type_infoE/s/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/'
|
|
|
|
|
+
|
|
|
|
|
# AM_CXXFLAGS needs to be in each subdirectory so that it can be
|
|
|
|
|
# modified in a per-library or per-sub-library way. Need to manually
|
|
|
|
|
# set this option because CONFIG_CXXFLAGS has to be after
|
|
|
|
|
@@ -749,6 +756,21 @@ hashtable_c++0x.lo: hashtable_c++0x.cc
|
|
|
|
|
@@ -748,6 +751,21 @@ hashtable_c++0x.lo: hashtable_c++0x.cc
|
|
|
|
|
hashtable_c++0x.o: hashtable_c++0x.cc
|
|
|
|
|
$(CXXCOMPILE) -fimplicit-templates -c $<
|
|
|
|
|
|
|
|
|
@ -128,19 +150,25 @@ Index: libstdc++-v3/src/c++11/Makefile.in
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@ -rm -f tmp-$@
|
|
|
|
|
+
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@cxx11-ios_failure.lo: cxx11-ios_failure-lt.s
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@ $(LTCXXCOMPILE) -c $< -o $@
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@ $(LTCXXCOMPILE) -g0 -c $< -o $@
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@cxx11-ios_failure.o: cxx11-ios_failure.s
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@ $(CXXCOMPILE) -c $<
|
|
|
|
|
+@ENABLE_DUAL_ABI_TRUE@ $(CXXCOMPILE) -g0 -c $<
|
|
|
|
|
+
|
|
|
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
|
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
|
|
|
.NOEXPORT:
|
|
|
|
|
Index: libstdc++-v3/src/c++11/ios.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/src/c++11/ios.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/src/c++11/ios.cc (revision 259281)
|
|
|
|
|
@@ -32,23 +32,11 @@
|
|
|
|
|
--- libstdc++-v3/src/c++11/ios.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/src/c++11/ios.cc (working copy)
|
|
|
|
|
@@ -26,29 +26,13 @@
|
|
|
|
|
// ISO C++ 14882: 27.4 Iostreams base classes
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
-// Determines the version of ios_base::failure thrown by __throw_ios_failure.
|
|
|
|
|
-// If !_GLIBCXX_USE_DUAL_ABI this will get undefined automatically.
|
|
|
|
|
-#define _GLIBCXX_USE_CXX11_ABI 1
|
|
|
|
|
-
|
|
|
|
|
#include <ios>
|
|
|
|
|
#include <limits>
|
|
|
|
|
-#include <bits/functexcept.h>
|
|
|
|
@ -165,8 +193,8 @@ Index: libstdc++-v3/src/c++11/ios.cc
|
|
|
|
|
const ios_base::fmtflags ios_base::dec;
|
|
|
|
|
Index: libstdc++-v3/src/c++11/cxx11-ios_failure.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/src/c++11/cxx11-ios_failure.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/src/c++11/cxx11-ios_failure.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/src/c++11/cxx11-ios_failure.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/src/c++11/cxx11-ios_failure.cc (working copy)
|
|
|
|
|
@@ -28,6 +28,15 @@
|
|
|
|
|
|
|
|
|
|
#define _GLIBCXX_USE_CXX11_ABI 1
|
|
|
|
@ -227,7 +255,7 @@ Index: libstdc++-v3/src/c++11/cxx11-ios_failure.cc
|
|
|
|
|
+ // __ios_failure can be upcast to the type in a catch handler.
|
|
|
|
|
+ bool
|
|
|
|
|
+ __iosfail_type_info::__do_upcast(const __class_type_info *dst_type,
|
|
|
|
|
+ void **obj_ptr) const
|
|
|
|
|
+ void **obj_ptr) const
|
|
|
|
|
+ {
|
|
|
|
|
+ // If the handler is for the gcc4-compatible ios::failure type then
|
|
|
|
|
+ // catch the object stored in __ios_failure::buf instead of
|
|
|
|
@ -237,7 +265,7 @@ Index: libstdc++-v3/src/c++11/cxx11-ios_failure.cc
|
|
|
|
|
+ *obj_ptr = static_cast<__ios_failure*>(*obj_ptr)->buf;
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
|
|
+ // Otherwise proceeed as normal to see if the handler matches.
|
|
|
|
|
+ // Otherwise proceed as normal to see if the handler matches.
|
|
|
|
|
+ return __class_type_info::__do_upcast(dst_type, obj_ptr);
|
|
|
|
|
+ }
|
|
|
|
|
+#else // ! __cpp_rtti
|
|
|
|
@ -252,18 +280,15 @@ Index: libstdc++-v3/src/c++11/cxx11-ios_failure.cc
|
|
|
|
|
} // namespace
|
|
|
|
|
Index: libstdc++-v3/src/c++11/Makefile.am
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/src/c++11/Makefile.am (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/src/c++11/Makefile.am (revision 259281)
|
|
|
|
|
@@ -126,6 +126,29 @@ hashtable_c++0x.lo: hashtable_c++0x.cc
|
|
|
|
|
--- libstdc++-v3/src/c++11/Makefile.am (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/src/c++11/Makefile.am (working copy)
|
|
|
|
|
@@ -126,6 +126,26 @@ hashtable_c++0x.lo: hashtable_c++0x.cc
|
|
|
|
|
hashtable_c++0x.o: hashtable_c++0x.cc
|
|
|
|
|
$(CXXCOMPILE) -fimplicit-templates -c $<
|
|
|
|
|
|
|
|
|
|
+if ENABLE_DUAL_ABI
|
|
|
|
|
+# Rewrite the type info for __dual_abi_ios_failure.
|
|
|
|
|
+rewrite_ios_failure_typeinfo = sed -e '/^_ZTISt13__ios_failure:$$/{' \
|
|
|
|
|
+ -e 'n' \
|
|
|
|
|
+ -e 's/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/' \
|
|
|
|
|
+ -e '}'
|
|
|
|
|
+# Rewrite the type info for __ios_failure.
|
|
|
|
|
+rewrite_ios_failure_typeinfo = sed -e '/^_*_ZTISt13__ios_failure:/,/_ZTVN10__cxxabiv120__si_class_type_infoE/s/_ZTVN10__cxxabiv120__si_class_type_infoE/_ZTVSt19__iosfail_type_info/'
|
|
|
|
|
+
|
|
|
|
|
+cxx11-ios_failure-lt.s: cxx11-ios_failure.cc
|
|
|
|
|
+ $(LTCXXCOMPILE) -S $< -o tmp-cxx11-ios_failure-lt.s
|
|
|
|
@ -276,9 +301,9 @@ Index: libstdc++-v3/src/c++11/Makefile.am
|
|
|
|
|
+ -rm -f tmp-$@
|
|
|
|
|
+
|
|
|
|
|
+cxx11-ios_failure.lo: cxx11-ios_failure-lt.s
|
|
|
|
|
+ $(LTCXXCOMPILE) -c $< -o $@
|
|
|
|
|
+ $(LTCXXCOMPILE) -g0 -c $< -o $@
|
|
|
|
|
+cxx11-ios_failure.o: cxx11-ios_failure.s
|
|
|
|
|
+ $(CXXCOMPILE) -c $<
|
|
|
|
|
+ $(CXXCOMPILE) -g0 -c $<
|
|
|
|
|
+endif
|
|
|
|
|
+
|
|
|
|
|
# AM_CXXFLAGS needs to be in each subdirectory so that it can be
|
|
|
|
@ -286,8 +311,8 @@ Index: libstdc++-v3/src/c++11/Makefile.am
|
|
|
|
|
# set this option because CONFIG_CXXFLAGS has to be after
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc (working copy)
|
|
|
|
|
@@ -50,18 +50,11 @@ void test02()
|
|
|
|
|
ios.pword(1) = v;
|
|
|
|
|
VERIFY( ios.pword(1) == v );
|
|
|
|
@ -338,7 +363,7 @@ Index: libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/ios_base/failure/dual_abi.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/ios_base/failure/dual_abi.cc (nonexistent)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/ios_base/failure/dual_abi.cc (revision 259281)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/ios_base/failure/dual_abi.cc (revision 259470)
|
|
|
|
|
@@ -0,0 +1,99 @@
|
|
|
|
|
+// Copyright (C) 2018 Free Software Foundation, Inc.
|
|
|
|
|
+//
|
|
|
|
@ -441,8 +466,8 @@ Index: libstdc++-v3/testsuite/27_io/ios_base/failure/dual_abi.cc
|
|
|
|
|
+}
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc (working copy)
|
|
|
|
|
@@ -46,13 +46,6 @@ void test02()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -468,8 +493,8 @@ Index: libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/1.cc
|
|
|
|
|
catch(...) {
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc (working copy)
|
|
|
|
|
@@ -50,20 +50,13 @@ void test01()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -494,8 +519,8 @@ Index: libstdc++-v3/testsuite/27_io/basic_ios/exceptions/char/1.cc
|
|
|
|
|
}
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc (working copy)
|
|
|
|
|
@@ -26,19 +26,12 @@ int main()
|
|
|
|
|
wistringstream stream;
|
|
|
|
|
stream.exceptions(ios_base::eofbit);
|
|
|
|
@ -519,8 +544,8 @@ Index: libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc
|
|
|
|
|
}
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/12297.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/12297.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/12297.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/12297.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/12297.cc (working copy)
|
|
|
|
|
@@ -26,19 +26,12 @@ int main()
|
|
|
|
|
istringstream stream;
|
|
|
|
|
stream.exceptions(ios_base::eofbit);
|
|
|
|
@ -544,8 +569,8 @@ Index: libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/12297.cc
|
|
|
|
|
}
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/exceptions_null.cc (working copy)
|
|
|
|
|
@@ -35,19 +35,12 @@ void test4()
|
|
|
|
|
wistringstream stream;
|
|
|
|
|
stream.exceptions(ios_base::failbit);
|
|
|
|
@ -569,8 +594,8 @@ Index: libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/excep
|
|
|
|
|
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptions_null.cc (working copy)
|
|
|
|
|
@@ -35,19 +35,12 @@ void test4()
|
|
|
|
|
istringstream stream;
|
|
|
|
|
stream.exceptions(ios_base::failbit);
|
|
|
|
@ -594,8 +619,8 @@ Index: libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/char/exceptio
|
|
|
|
|
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/exceptions_failbit.cc (working copy)
|
|
|
|
|
@@ -27,20 +27,13 @@ void test_failbit()
|
|
|
|
|
wistringstream stream(L"jaylib - champion sound");
|
|
|
|
|
stream.exceptions(ios_base::failbit);
|
|
|
|
@ -620,8 +645,8 @@ Index: libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/
|
|
|
|
|
VERIFY( stream.fail() );
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exceptions_failbit.cc (working copy)
|
|
|
|
|
@@ -27,20 +27,13 @@ void test_failbit()
|
|
|
|
|
istringstream stream("jaylib - champion sound");
|
|
|
|
|
stream.exceptions(ios_base::failbit);
|
|
|
|
@ -646,8 +671,8 @@ Index: libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/exc
|
|
|
|
|
VERIFY( stream.fail() );
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/exceptions_null.cc (working copy)
|
|
|
|
|
@@ -37,19 +37,12 @@ void test3()
|
|
|
|
|
wostringstream stream;
|
|
|
|
|
stream.exceptions(ios_base::badbit);
|
|
|
|
@ -671,8 +696,8 @@ Index: libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/except
|
|
|
|
|
|
|
|
|
|
Index: libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc (revision 259280)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc (revision 259281)
|
|
|
|
|
--- libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc (revision 259351)
|
|
|
|
|
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/char/exceptions_null.cc (working copy)
|
|
|
|
|
@@ -37,19 +37,12 @@ void test3()
|
|
|
|
|
ostringstream stream;
|
|
|
|
|
stream.exceptions(ios_base::badbit);
|
|
|
|
|