From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 15 Sep 2014 10:57:51 +0000 (+0100)
Subject: regex.h (basic_regex): Rename _Ch_typeraits template parameters to _Ch_traits.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4564acc36fc9105aa6622601fa62bfa7cfff203b;p=gcc.git

regex.h (basic_regex): Rename _Ch_typeraits template parameters to _Ch_traits.

	* include/bits/regex.h (basic_regex): Rename _Ch_typeraits template
	parameters to _Ch_traits.

From-SVN: r215261
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 266a1166237..4ac9347e9be 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-15  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/bits/regex.h (basic_regex): Rename _Ch_typeraits template
+	parameters to _Ch_traits.
+
 2014-09-12  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/debug/deque (__gnu_debug::deque): Make base class C++11
diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index 9dc83fda562..52050890c9a 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -577,9 +577,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        *
        * @param __s A pointer to a string containing a regular expression.
        */
-      template<typename _Ch_typeraits, typename _Alloc>
+      template<typename _Ch_traits, typename _Alloc>
 	basic_regex&
-	operator=(const basic_string<_Ch_type, _Ch_typeraits, _Alloc>& __s)
+	operator=(const basic_string<_Ch_type, _Ch_traits, _Alloc>& __s)
 	{ return this->assign(__s, flags()); }
 
       // [7.8.3] assign
@@ -654,9 +654,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        * expression pattern interpreted according to @p __flags.  If
        * regex_error is thrown, *this remains unchanged.
        */
-      template<typename _Ch_typeraits, typename _Alloc>
+      template<typename _Ch_traits, typename _Alloc>
 	basic_regex&
-	assign(const basic_string<_Ch_type, _Ch_typeraits, _Alloc>& __s,
+	assign(const basic_string<_Ch_type, _Ch_traits, _Alloc>& __s,
 	       flag_type __flags = ECMAScript)
 	{
 	  _M_flags = __flags;