Fix an over-eager find'n'replace. Tested x86_64-linux, committed to trunk.
commit 3e9a05fcd4278438229a6d1515ad0d6d3b17f4a9 Author: Jonathan Wakely <jwak...@redhat.com> Date: Mon Sep 15 11:13:52 2014 +0100
* include/bits/regex.h (basic_regex): Rename _Ch_typeraits template parameters to _Ch_traits. diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 9dc83fd..5205089 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;