From 741346a2af437a013f9ba01742588d75f933fa78 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 12 Apr 2018 21:55:02 +0100 Subject: [PATCH] Fix comments that misspell names of files and classes * 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 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/src/c++11/Makefile.am | 2 +- libstdc++-v3/src/c++11/Makefile.in | 2 +- libstdc++-v3/src/c++11/cxx11-ios_failure.cc | 4 ++-- libstdc++-v3/src/c++98/ios_failure.cc | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b38be432cc7..e0069a6854c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2018-04-12 Jonathan Wakely + * 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 diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am index 6f49f0d55d3..8d524b67232 100644 --- a/libstdc++-v3/src/c++11/Makefile.am +++ b/libstdc++-v3/src/c++11/Makefile.am @@ -127,7 +127,7 @@ 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 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/' \ diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in index 26833b04b42..1ae782d7e96 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -434,7 +434,7 @@ sources = \ 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/' \ diff --git a/libstdc++-v3/src/c++11/cxx11-ios_failure.cc b/libstdc++-v3/src/c++11/cxx11-ios_failure.cc index 847b5946234..b1e4bfb2b44 100644 --- a/libstdc++-v3/src/c++11/cxx11-ios_failure.cc +++ b/libstdc++-v3/src/c++11/cxx11-ios_failure.cc @@ -140,7 +140,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // __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 @@ -150,7 +150,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION *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 diff --git a/libstdc++-v3/src/c++98/ios_failure.cc b/libstdc++-v3/src/c++98/ios_failure.cc index a2fc5593e15..49d24f49620 100644 --- a/libstdc++-v3/src/c++98/ios_failure.cc +++ b/libstdc++-v3/src/c++98/ios_failure.cc @@ -57,7 +57,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #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, -- 2.30.2