From 3ef453743fed6e89c2275b0e9a61ade3c81eb3d9 Mon Sep 17 00:00:00 2001 From: paolo Date: Sat, 22 Nov 2003 18:47:13 +0000 Subject: [PATCH] 2003-11-22 Paolo Carlini * config/locale/gnu/monetary_members.cc (money_base::_S_construct_pattern): Factor out two assignments. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73844 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ 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 + * config/locale/gnu/monetary_members.cc + (money_base::_S_construct_pattern): Factor out two assignments. + +2003-11-22 Paolo Carlini + * 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 -- 2.7.4