From 68e69ce27fe7b25cf2606f83af2fc300c0b4f1f4 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Fri, 8 Nov 2013 14:30:29 +0000
Subject: regex_automaton.h (__detail::_State, [...]): Remove redundant _CharT
 template parameters.

	* include/bits/regex_automaton.h (__detail::_State, __detail::_NFA,
	__detail::_StateSeq): Remove redundant _CharT template parameters.
	* include/bits/regex_automaton.tcc: Likewise.
	* include/bits/regex_compiler.h (__detail::_Compiler): Likewise.
	(__compile_nfa): Add object generator for _Compiler.
	* include/bits/regex_compiler.tcc: Remove _CharT template parameters.
	* include/bits/regex_executor.h: Likewise.
	* include/bits/regex_executor.tcc: Likewise.
	* include/bits/regex.h (basic_regex): Assert char_type matches. Use
	__compile_nfa object generator. Remove _CharT template parameter.

From-SVN: r204572
---
 libstdc++-v3/include/bits/regex_automaton.tcc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'libstdc++-v3/include/bits/regex_automaton.tcc')

diff --git a/libstdc++-v3/include/bits/regex_automaton.tcc b/libstdc++-v3/include/bits/regex_automaton.tcc
index 0c25c63..b0734cf 100644
--- a/libstdc++-v3/include/bits/regex_automaton.tcc
+++ b/libstdc++-v3/include/bits/regex_automaton.tcc
@@ -129,9 +129,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     return __ostr;
   }
 
-  template<typename _CharT, typename _TraitsT>
+  template<typename _TraitsT>
     std::ostream&
-    _NFA<_CharT, _TraitsT>::_M_dot(std::ostream& __ostr) const
+    _NFA<_TraitsT>::_M_dot(std::ostream& __ostr) const
     {
       __ostr << "digraph _Nfa {\n"
 	        "  rankdir=LR;\n";
@@ -142,9 +142,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     }
 #endif
 
-  template<typename _CharT, typename _TraitsT>
+  template<typename _TraitsT>
     _StateIdT
-    _NFA<_CharT, _TraitsT>::_M_insert_backref(size_t __index)
+    _NFA<_TraitsT>::_M_insert_backref(size_t __index)
     {
       // To figure out whether a backref is valid, a stack is used to store
       // unfinished sub-expressions. For example, when parsing
@@ -164,9 +164,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       return _M_insert_state(std::move(__tmp));
     }
 
-  template<typename _CharT, typename _TraitsT>
+  template<typename _TraitsT>
     void
-    _NFA<_CharT, _TraitsT>::_M_eliminate_dummy()
+    _NFA<_TraitsT>::_M_eliminate_dummy()
     {
       for (auto& __it : *this)
 	{
@@ -182,9 +182,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     }
 
   // Just apply DFS on the sequence and re-link their links.
-  template<typename _CharT, typename _TraitsT>
-    _StateSeq<_CharT, _TraitsT>
-    _StateSeq<_CharT, _TraitsT>::_M_clone()
+  template<typename _TraitsT>
+    _StateSeq<_TraitsT>
+    _StateSeq<_TraitsT>::_M_clone()
     {
       std::map<_StateIdT, _StateIdT> __m;
       std::stack<_StateIdT> __stack;
-- 
cgit v1.1