OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2014-09-15 11:57:51 +01:00 committed by Jonathan Wakely
parent 89fc051f16
commit 4564acc36f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -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

8
libstdc++-v3/include/bits/regex.h
View File

@ -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;