diff options
author | Mike Buland <eichlan@xagasoft.com> | 2012-09-05 19:29:29 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2012-09-05 19:29:29 +0000 |
commit | 69d1606ac97547896a0ede8dee5e59fc4a5de7c2 (patch) | |
tree | 0bbbd7d92387c2c810e33cf594e9406485da6915 /src/stable | |
parent | 67a4bba2ce4be36a23d75d9ae060579d554f6a17 (diff) | |
download | libbu++-69d1606ac97547896a0ede8dee5e59fc4a5de7c2.tar.gz libbu++-69d1606ac97547896a0ede8dee5e59fc4a5de7c2.tar.bz2 libbu++-69d1606ac97547896a0ede8dee5e59fc4a5de7c2.tar.xz libbu++-69d1606ac97547896a0ede8dee5e59fc4a5de7c2.zip |
Fixed silly bug involving juxtaposed replacement tokens in
Bu::String::FormatProxy substitutions.
Diffstat (limited to 'src/stable')
-rw-r--r-- | src/stable/string.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/stable/string.cpp b/src/stable/string.cpp index 621da93..4cef6b1 100644 --- a/src/stable/string.cpp +++ b/src/stable/string.cpp | |||
@@ -1252,7 +1252,7 @@ Bu::String::FormatProxy::operator Bu::String() const | |||
1252 | } | 1252 | } |
1253 | Bu::MemBuf mbOut; | 1253 | Bu::MemBuf mbOut; |
1254 | Bu::Formatter f( mbOut ); | 1254 | Bu::Formatter f( mbOut ); |
1255 | for( String::const_iterator s = rFmt.begin(); s; s++ ) | 1255 | for( String::const_iterator s = rFmt.begin(); s; ) |
1256 | { | 1256 | { |
1257 | if( *s == '%' ) | 1257 | if( *s == '%' ) |
1258 | { | 1258 | { |
@@ -1278,14 +1278,14 @@ Bu::String::FormatProxy::operator Bu::String() const | |||
1278 | } | 1278 | } |
1279 | 1279 | ||
1280 | f << (*aArg[iIndex]).format << (*aArg[iIndex]).value; | 1280 | f << (*aArg[iIndex]).format << (*aArg[iIndex]).value; |
1281 | if( s ) | 1281 | continue; |
1282 | f << *s; | ||
1283 | } | 1282 | } |
1284 | } | 1283 | } |
1285 | else | 1284 | else |
1286 | { | 1285 | { |
1287 | f << *s; | 1286 | f << *s; |
1288 | } | 1287 | } |
1288 | s++; | ||
1289 | } | 1289 | } |
1290 | 1290 | ||
1291 | delete[] aArg; | 1291 | delete[] aArg; |