diff options
author | Paolo Carlini <pcarlini@unitus.it> | 2003-10-01 17:43:07 +0200 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-10-01 15:43:07 +0000 |
commit | 530ce5517ce00a43761d303a614b25d3371dd030 (patch) | |
tree | 5c8c89a774d6f3fb39f6bf00d8c3aa32ad41031d | |
parent | 52a16d0815a08b0af6fba0c24a87917de17e3ef1 (diff) | |
download | gcc-530ce5517ce00a43761d303a614b25d3371dd030.zip gcc-530ce5517ce00a43761d303a614b25d3371dd030.tar.gz gcc-530ce5517ce00a43761d303a614b25d3371dd030.tar.bz2 |
locale_facets.tcc (time_put::put): Minor tweak to the previous commit.
2003-10-01 Paolo Carlini <pcarlini@unitus.it>
* include/bits/locale_facets.tcc (time_put::put): Minor
tweak to the previous commit.
From-SVN: r71977
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/locale_facets.tcc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4b776c8..7c1550a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2003-10-01 Paolo Carlini <pcarlini@unitus.it> + * include/bits/locale_facets.tcc (time_put::put): Minor + tweak to the previous commit. + +2003-10-01 Paolo Carlini <pcarlini@unitus.it> + PR libstdc++/12439 * include/bits/locale_facets.tcc (time_put::put): Deal with the three issues pointed out by the PR. diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 62127b9..620e6e2 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -2007,9 +2007,9 @@ namespace std ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc); while (__beg != __end) { - const _CharT* __tmp = __beg; + const _CharT __tmp = *__beg; ++__beg; - if (__ctype.narrow(*__tmp, 0) == '%' && __beg != __end) + if (__ctype.narrow(__tmp, 0) == '%' && __beg != __end) { char __format; char __mod = 0; @@ -2026,7 +2026,7 @@ namespace std __s = this->do_put(__s, __io, __fill, __tm, __format, __mod); } else - *__s++ = *__tmp; + *__s++ = __tmp; } return __s; } |