X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffmt.cpp;h=b476c36f6c2def97ec4093e7259ec52d1cad48bc;hp=c9f5d6c70eac16ff071acaf9208d9001925f2993;hb=4ec2cf9b91a9918f02990c40145bb39a87b0e2bb;hpb=58384e355b4a78730d69243f1092e47591f2f384 diff --git a/source/fmt.cpp b/source/fmt.cpp index c9f5d6c..b476c36 100644 --- a/source/fmt.cpp +++ b/source/fmt.cpp @@ -32,7 +32,7 @@ void Fmt::apply(ostream &out) const { out.flags(((base==HEX) ? ios_base::hex : (base==OCT) ? ios_base::oct : ios_base::dec) | ((fmode==SCI) ? ios_base::scientific : (fmode==FIXED) ? ios_base::fixed : ios_base::fmtflags(0)) - | (fillc ? ios_base::internal : (align==LEFT) ? ios_base::left : ios_base::right) + | (fillc=='0' ? ios_base::internal : (align==LEFT) ? ios_base::left : ios_base::right) | (sbase ? ios_base::showbase : ios_base::fmtflags(0)) | (spoint ? ios_base::showpoint : ios_base::fmtflags(0)) | (spos ? ios_base::showpos : ios_base::fmtflags(0)) @@ -93,11 +93,11 @@ void Fmt::parse(const char *f) else if(*f=='o') base=OCT; else if(*f=='e' || *f=='E') - fmode=EXP; + fmode=SCI; else if(*f=='f' || *f=='F') fmode=FIXED; else if(*f=='g' || *f=='G') - fmode=SCI; + fmode=EXP; else if(*f=='p') { base=HEX;