re PR libstdc++/60958 (Initialization of arrays in tr1/regex ill-formed or with undef...

	PR libstdc++/60958
	* include/tr1/regex (regex_traits::isctype): Comment out broken code.
	* testsuite/util/testsuite_regex.h (regex_match_debug): Improve
	comment.

From-SVN: r209807

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 75853f84e4bf730726b08061dd3f5616c944b6f2..eace534a30b7a563fe1aaf7427fee4ee50dbf63f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-25  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/60958
+       * include/tr1/regex (regex_traits::isctype): Comment out broken code.
+       * testsuite/util/testsuite_regex.h (regex_match_debug): Improve
+       comment.
+
 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
 
        * testsuite/util/testsuite_abi.cc (check_version): Update for

diff --git a/libstdc++-v3/include/tr1/regex b/libstdc++-v3/include/tr1/regex
index 3cff23a26567bf590dc41ee124c5cf314dc8c0ec..0387472ddccd5e31dcd6e758e9d87ae0d14b037a 100644 (file)
--- a/libstdc++-v3/include/tr1/regex
+++ b/libstdc++-v3/include/tr1/regex
@@ -678,7 +678,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       
       if (__ctype.is(__c, __f))
        return true;
-      
+#if 0
       // special case of underscore in [[:w:]]
       if (__c == __ctype.widen('_'))
        {
@@ -698,7 +698,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
          if (__f | __bt)
            return true;
        }
-      
+#endif
       return false;
     }
 

diff --git a/libstdc++-v3/testsuite/util/testsuite_regex.h b/libstdc++-v3/testsuite/util/testsuite_regex.h
index 9460ed6ae311199376ecc48508f742c24f8670e4..c2031e90a23310c3ff00bcfc46d603f6437d5375 100644 (file)
--- a/libstdc++-v3/testsuite/util/testsuite_regex.h
+++ b/libstdc++-v3/testsuite/util/testsuite_regex.h
@@ -131,7 +131,7 @@ namespace __gnu_test
 
   // regex_match_debug behaves like regex_match, but will run *two* executors
   // (if there's no back-reference) and check if their results agree. If not,
-  // an exception throws. One can use them just in the way of using regex_match.
+  // an exception is thrown. The arguments are the same as for regex_match.
   template<typename _Bi_iter, typename _Alloc,
           typename _Ch_type, typename _Rx_traits>
     bool
@@ -153,7 +153,7 @@ namespace __gnu_test
       // __m is unspecified if return value is false.
       if (__res1 == __res2 && (!__res1 || __m == __mm))
        return __res1;
-      throw(std::exception());
+      throw std::exception();
     }
 
   // No match_results version