From cc0c2f7986cb01646b8a90f546fe1b4258e30308 Mon Sep 17 00:00:00 2001 From: Paolo Carlini 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. From-SVN: r73844 --- 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 33eccf8f698..19de20cc333 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +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<>&)): diff --git a/libstdc++-v3/config/locale/gnu/monetary_members.cc b/libstdc++-v3/config/locale/gnu/monetary_members.cc index c1f68c6474d..e39d7f97797 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