summaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/bits
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-09-15 10:57:51 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-09-15 10:57:51 +0000
commitaa98134bfa8619a4be4958f62cec70125cd4b7ff (patch)
treeb5332f6f96e09e989bc96223d47dd9886327d641 /libstdc++-v3/include/bits
parent95603b68b08458f70aad07009efd456b71f22038 (diff)
downloadgcc-aa98134bfa8619a4be4958f62cec70125cd4b7ff.tar.gz
* include/bits/regex.h (basic_regex): Rename _Ch_typeraits template
parameters to _Ch_traits. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215261 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits')
-rw-r--r--libstdc++-v3/include/bits/regex.h8
1 files changed, 4 insertions, 4 deletions
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;