diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2011-02-16 22:29:15 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2011-02-16 22:29:15 +0000 |
| commit | 8c53c3ae5aab9775e9464d010677d78e113715e3 (patch) | |
| tree | 2878a3f36db58754e4374cff0e74e15e31077a23 | |
| parent | 45cab1d72e5a1702c0abf9d91c07dec5e42f110b (diff) | |
| download | gcc-8c53c3ae5aab9775e9464d010677d78e113715e3.zip gcc-8c53c3ae5aab9775e9464d010677d78e113715e3.tar.gz gcc-8c53c3ae5aab9775e9464d010677d78e113715e3.tar.bz2 | |
regex.h (match_results::format): Use char_traits.
2011-02-16 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/bits/regex.h (match_results::format): Use char_traits.
From-SVN: r170225
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 077372c..3e606d2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2011-02-16 Jonathan Wakely <jwakely.gcc@gmail.com> + + * include/bits/regex.h (match_results::format): Use char_traits. + 2011-02-16 Benjamin Kosnik <bkoz@redhat.com> * include/std/atomic: Remove atomic_address, uplift to N3225. diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 627bdc0..18cd882 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -1758,7 +1758,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION = regex_constants::format_default) const { string_type __result; - format(std::back_inserter(__result), __fmt + __builtin_strlen(__fmt), + format(std::back_inserter(__result), + __fmt + char_traits<char_type>::length(__fmt), __flags); return __result; } |