* 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.
From-SVN: r259357
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.
+
* src/c++11/ios.cc: Remove redundant macro definition.
2018-04-11 Jonathan Wakely <jwakely@redhat.com>
$(CXXCOMPILE) -fimplicit-templates -c $<
if ENABLE_DUAL_ABI
-# Rewrite the type info for __dual_abi_ios_failure.
+# Rewrite the type info for __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/' \
libc__11convenience_la_SOURCES = $(sources) $(inst_sources)
-# Rewrite the type info for __dual_abi_ios_failure.
+# Rewrite the type info for __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/' \
// __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
*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
#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,