diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2003-11-22 18:47:13 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-11-22 18:47:13 +0000 |
| commit | cc0c2f7986cb01646b8a90f546fe1b4258e30308 (patch) | |
| tree | 5cacf2501e30868146c3ab810f3fed564e3c63a9 | |
| parent | 343c49ce753ba631174df2a3898b1e16ac4aba4b (diff) | |
| download | gcc-cc0c2f7986cb01646b8a90f546fe1b4258e30308.zip gcc-cc0c2f7986cb01646b8a90f546fe1b4258e30308.tar.gz gcc-cc0c2f7986cb01646b8a90f546fe1b4258e30308.tar.bz2 | |
2003-11-22 Paolo Carlini <pcarlini@suse.de>
* config/locale/gnu/monetary_members.cc
(money_base::_S_construct_pattern): Factor out two assignments.
From-SVN: r73844
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/monetary_members.cc | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 33eccf8..19de20c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2003-11-22 Paolo Carlini <pcarlini@suse.de> + * config/locale/gnu/monetary_members.cc + (money_base::_S_construct_pattern): Factor out two assignments. + +2003-11-22 Paolo Carlini <pcarlini@suse.de> + * include/bits/istream.tcc (getline(basic_string<>&)): Fix error in comment of the previous commit. diff --git a/libstdc++-v3/config/locale/gnu/monetary_members.cc b/libstdc++-v3/config/locale/gnu/monetary_members.cc index c1f68c6..e39d7f9 100644 --- a/libstdc++-v3/config/locale/gnu/monetary_members.cc +++ b/libstdc++-v3/config/locale/gnu/monetary_members.cc @@ -63,6 +63,7 @@ namespace std case 0: case 1: // 1 The sign precedes the value and symbol. + __ret.field[0] = sign; if (__space) { // Pattern starts with sign. @@ -76,7 +77,6 @@ namespace std __ret.field[1] = value; __ret.field[3] = symbol; } - __ret.field[0] = sign; __ret.field[2] = space; } else @@ -92,7 +92,6 @@ namespace std __ret.field[1] = value; __ret.field[2] = symbol; } - __ret.field[0] = sign; __ret.field[3] = none; } break; @@ -104,15 +103,14 @@ namespace std if (__precedes) { __ret.field[0] = symbol; - __ret.field[1] = space; __ret.field[2] = value; } else { __ret.field[0] = value; - __ret.field[1] = space; __ret.field[2] = symbol; } + __ret.field[1] = space; __ret.field[3] = sign; } else |