aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2004-03-01 17:29:27 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2004-03-01 17:29:27 +0000
commit98e953f57b334e690be6b162cc18df798b579f3c (patch)
tree0e61bfee5274f121c11feb72062636f5dba85885
parentb19fb27d1e08dc9e666289b35984ffd2ba052e86 (diff)
downloadgcc-98e953f57b334e690be6b162cc18df798b579f3c.zip
gcc-98e953f57b334e690be6b162cc18df798b579f3c.tar.gz
gcc-98e953f57b334e690be6b162cc18df798b579f3c.tar.bz2
locale_facets.tcc (money_get<>::_M_extract, [...]): ...
2004-03-01 Paolo Carlini <pcarlini@suse.de> * include/bits/locale_facets.tcc (money_get<>::_M_extract, money_get<>::do_get(string_type&)): ... and two more. From-SVN: r78708
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/locale_facets.tcc4
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1a7828c..d3e4fc9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2004-03-01 Paolo Carlini <pcarlini@suse.de>
+ * include/bits/locale_facets.tcc (money_get<>::_M_extract,
+ money_get<>::do_get(string_type&)): ... and two more.
+
+2004-03-01 Paolo Carlini <pcarlini@suse.de>
+
* include/bits/locale_facets.tcc (money_get<>::_M_extract):
Fix thinkos in the switch from string_type& to string& as last
argument.
diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 399b5ad..712bfcc 100644
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -1339,7 +1339,7 @@ namespace std
if (__res.size() > 1)
{
const size_type __first = __res.find_first_not_of('0');
- const bool __only_zeros = __first == string_type::npos;
+ const bool __only_zeros = __first == string::npos;
if (__first)
__res.erase(0, __only_zeros ? __res.size() - 1 : __first);
}
@@ -1405,7 +1405,7 @@ namespace std
do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io,
ios_base::iostate& __err, string_type& __units) const
{
- typedef typename string_type::size_type size_type;
+ typedef typename string::size_type size_type;
const locale& __loc = __io._M_getloc();
const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);