From: Jonathan Wakely Date: Thu, 18 May 2017 15:31:13 +0000 (+0100) Subject: Fix comments in libstdc++ header and test X-Git-Tag: releases/gcc-5.5.0~351 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2665470476ff6cdd0846f9c32dfa02eeb5af662;p=thirdparty%2Fgcc.git Fix comments in libstdc++ header and test Backport from mainline 2017-04-03 Jonathan Wakely * include/bits/ios_base.h: Correct comment. * testsuite/util/testsuite_hooks.h: Likewise. From-SVN: r248234 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 439069f8091a..ba41e4a987b8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2017-05-18 Jonathan Wakely + Backport from mainline + 2017-04-03 Jonathan Wakely + + * include/bits/ios_base.h: Correct comment. + * testsuite/util/testsuite_hooks.h: Likewise. + Backport from mainline 2017-03-16 Jonathan Wakely diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h index 7e91c0bbbb0e..e1de534986bc 100644 --- a/libstdc++-v3/include/bits/ios_base.h +++ b/libstdc++-v3/include/bits/ios_base.h @@ -52,8 +52,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // The following definitions of bitmask types are enums, not ints, // as permitted (but not required) in the standard, in order to provide - // better type safety in iostream calls. A side effect is that - // expressions involving them are no longer compile-time constants. + // better type safety in iostream calls. A side effect is that in C++98 + // expressions involving them are not compile-time constants. enum _Ios_Fmtflags { _S_boolalpha = 1L << 0, diff --git a/libstdc++-v3/testsuite/util/testsuite_hooks.h b/libstdc++-v3/testsuite/util/testsuite_hooks.h index d0c8b1d6bfd4..ee3f2a7ce0e7 100644 --- a/libstdc++-v3/testsuite/util/testsuite_hooks.h +++ b/libstdc++-v3/testsuite/util/testsuite_hooks.h @@ -226,9 +226,9 @@ namespace __gnu_test private: static unsigned int _M_count; }; - - // An class of objects that can be used for validating various - // behaviours and guarantees of containers and algorithms defined in + + // A class of objects that can be used for validating various + // behaviors and guarantees of containers and algorithms defined in // the standard library. class copy_tracker {