re PR libstdc++/63219 (Superfluous template parameter in match_result::format overload)

	PR libstdc++/63219
	* include/bits/regex.h (match_results::format): Remove stray template
	parameter.
	* include/bits/regex_compiler.h (_RegexTranslator::_RegexTranslator):
	Remove parameter name to avoid -Wunused-parameter warning.
	* include/bits/regex_executor.h (_State_info::_State_info): Reorder
	mem-initializers to avoid -Wreorder warning.
	* include/bits/regex_executor.tcc (_Executor::_M_word_boundary):
	Remove parameter name to avoid -Wunused-parameter warning.
	* include/bits/regex_scanner.tcc (_Scanner::_M_advance): Add braces
	to avoid -Wempty-body warning when not in debug mode.

From-SVN: r215160

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 79ddf35a4dcbdbab067f3d7935355ab67f46e76b..29fdb5662f1bb8bf7fb6e34d9a0bad8966abbf91 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2014-09-11  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/63219
+       * include/bits/regex.h (match_results::format): Remove stray template
+       parameter.
+       * include/bits/regex_compiler.h (_RegexTranslator::_RegexTranslator):
+       Remove parameter name to avoid -Wunused-parameter warning.
+       * include/bits/regex_executor.h (_State_info::_State_info): Reorder
+       mem-initializers to avoid -Wreorder warning.
+       * include/bits/regex_executor.tcc (_Executor::_M_word_boundary):
+       Remove parameter name to avoid -Wunused-parameter warning.
+       * include/bits/regex_scanner.tcc (_Scanner::_M_advance): Add braces
+       to avoid -Wempty-body warning when not in debug mode.
+
 2014-09-10  Siva Chandra Reddy  <sivachandra@google.com>
 
        * python/hook.in: Load the xmethods.

diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index e556350adca8c315aa58fe0ee30dbfaa9980b38b..9dc83fda562ecd43dc0df9d3b877c6386eea0f46 100644 (file)
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -1814,7 +1814,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       /**
        * @pre   ready() == true
        */
-      template<typename _Out_iter, typename _St, typename _Sa>
+      template<typename _St, typename _Sa>
        basic_string<char_type, _St, _Sa>
        format(const basic_string<char_type, _St, _Sa>& __fmt,
               match_flag_type __flags = regex_constants::format_default) const

diff --git a/libstdc++-v3/include/bits/regex_compiler.h b/libstdc++-v3/include/bits/regex_compiler.h
index ca116de53af4fd998b571646740b85d081e3cfd6..1193a5aea5a728cfd36487398e12229c90166ec2 100644 (file)
--- a/libstdc++-v3/include/bits/regex_compiler.h
+++ b/libstdc++-v3/include/bits/regex_compiler.h
@@ -212,7 +212,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       typedef _CharT                       _StrTransT;
 
       explicit
-      _RegexTranslator(const _TraitsT& __traits)
+      _RegexTranslator(const _TraitsT&)
       { }
 
       _CharT

diff --git a/libstdc++-v3/include/bits/regex_executor.h b/libstdc++-v3/include/bits/regex_executor.h
index 40d3443d9855f139c12b03e70ce264d41d3685b1..130bc742b215070d885addea35f8bd56f5d4a5fd 100644 (file)
--- a/libstdc++-v3/include/bits/regex_executor.h
+++ b/libstdc++-v3/include/bits/regex_executor.h
@@ -159,7 +159,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        {
          explicit
          _State_info(_StateIdT __start, size_t __n)
-         : _M_start(__start), _M_visited_states(new bool[__n]())
+         : _M_visited_states(new bool[__n]()), _M_start(__start)
          { }
 
          bool _M_visited(_StateIdT __i)

diff --git a/libstdc++-v3/include/bits/regex_executor.tcc b/libstdc++-v3/include/bits/regex_executor.tcc
index 3c68668dbcf10a0fee101e2fe3b60ad97b706af9..3ca7de3d7fd1763dcf09a93b37e23fdf7ead11b0 100644 (file)
--- a/libstdc++-v3/include/bits/regex_executor.tcc
+++ b/libstdc++-v3/include/bits/regex_executor.tcc
@@ -407,7 +407,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<typename _BiIter, typename _Alloc, typename _TraitsT,
           bool __dfs_mode>
     bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
-    _M_word_boundary(_State<_TraitsT> __state) const
+    _M_word_boundary(_State<_TraitsT>) const
     {
       // By definition.
       bool __ans = false;

diff --git a/libstdc++-v3/include/bits/regex_scanner.tcc b/libstdc++-v3/include/bits/regex_scanner.tcc
index 818e47b5670005ffb24be9598adf37ff3c7f1c99..1dc2fd9e92cc6b535526049cabb0e204dc2f2ca6 100644 (file)
--- a/libstdc++-v3/include/bits/regex_scanner.tcc
+++ b/libstdc++-v3/include/bits/regex_scanner.tcc
@@ -83,7 +83,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       else if (_M_state == _S_state_in_brace)
        _M_scan_in_brace();
       else
-       _GLIBCXX_DEBUG_ASSERT(false);
+       {
+         _GLIBCXX_DEBUG_ASSERT(false);
+       }
     }
 
   // Differences between styles: