From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 11 Sep 2014 10:01:20 +0000 (+0100)
Subject: re PR libstdc++/63219 (Superfluous template parameter in match_result::format overload)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8aed2f2f63cebce1fc0c9af95df68c2d7efc52a3;p=gcc.git

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 79ddf35a4dc..29fdb5662f1 100644
--- 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 e556350adca..9dc83fda562 100644
--- 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 ca116de53af..1193a5aea5a 100644
--- 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 40d3443d985..130bc742b21 100644
--- 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 3c68668dbcf..3ca7de3d7fd 100644
--- 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 818e47b5670..1dc2fd9e92c 100644
--- 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: