X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstrings%2Fformat.cpp;h=42926e158d593a8a5d84ffb88dfcdddce26a80d5;hb=d15b96b498d7cad51a0cb1dd949f70a04af246e9;hp=1b8b4650a9efc852e2ab42268c775d7f5cb858f1;hpb=1f0843257065789231a9949e0a81b79afd7bbebe;p=libs%2Fcore.git diff --git a/source/strings/format.cpp b/source/strings/format.cpp index 1b8b465..42926e1 100644 --- a/source/strings/format.cpp +++ b/source/strings/format.cpp @@ -11,6 +11,23 @@ Formatter::Formatter(const string &f): advance(); } +Formatter::Formatter(const Formatter &other): + fmt(other.fmt), + pos(fmt.begin()+(other.pos-other.fmt.begin())), + result(other.result) +{ } + +Formatter &Formatter::operator=(const Formatter &other) +{ + if(&other==this) + return *this; + + fmt = other.fmt; + pos = fmt.begin()+(other.pos-other.fmt.begin()); + result = other.result; + return *this; +} + const string &Formatter::str() const { if(pos!=fmt.end()) @@ -41,7 +58,7 @@ Fmt Formatter::get_conversion() if(pos==fmt.end()) throw format_error("Too many arguments for format"); - string::iterator i = pos; + auto i = pos; for(; i!=fmt.end(); ++i) if(isalpha(*i)) break;