Fix comments in libstdc++ header and test

Backport from mainline
2017-04-03  Jonathan Wakely  <jwakely@redhat.com>

	* 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 439069f8091ad9afeafb14f885b96774b6403e6c..ba41e4a987b8abffb0ec2cf128e1e3a2120fcf17 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
 2017-05-18  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       2017-04-03  Jonathan Wakely  <jwakely@redhat.com>
+
+       * include/bits/ios_base.h: Correct comment.
+       * testsuite/util/testsuite_hooks.h: Likewise.
+
        Backport from mainline
        2017-03-16  Jonathan Wakely  <jwakely@redhat.com>
 

diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h
index 7e91c0bbbb0ea840406897d28d65d7287c9797e3..e1de534986bcae7a079e0da98dec082f49565c01 100644 (file)
--- 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 d0c8b1d6bfd426760cac0082b9f0cd3c6697c33e..ee3f2a7ce0e7307f9510c4fa31d0bd7a9c6b658c 100644 (file)
--- 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
   {