X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstrings%2Flexicalcast.cpp;h=8789544bbb355f14f421ccd9a6ea5f761a25e256;hp=ab83b110b432ba408f8bdfa3bd2fb53d3e848c8f;hb=20c897ece781e18ba54c41fd68e232ce566a938d;hpb=faeafc9d652ba6caa350ca95dff14408b036ccfb diff --git a/source/strings/lexicalcast.cpp b/source/strings/lexicalcast.cpp index ab83b11..8789544 100644 --- a/source/strings/lexicalcast.cpp +++ b/source/strings/lexicalcast.cpp @@ -108,12 +108,12 @@ string int_to_str(T v, const Fmt &f) } template -T str_to_int(const std::string &s, const Fmt &f) +T str_to_int(const string &s, const Fmt &f) { if(s.empty()) throw lexical_error("conversion of '' to integer"); - std::string::const_iterator i = s.begin(); + string::const_iterator i = s.begin(); // See if the input starts with a sign bool neg = false; @@ -389,7 +389,7 @@ T str_to_flt(const string &s, const Fmt &) if(s.empty()) throw lexical_error("conversion of '' to floating-point"); - std::string::const_iterator i = s.begin(); + string::const_iterator i = s.begin(); // See if the input starts with a sign bool neg = false; @@ -471,6 +471,7 @@ namespace Msp { void LexicalConverter::result(const string &s) { + filled = true; if(s.size()>(const LexicalConverter &c, char &v) v = str_to_int(c.get(), c.get_fmt()); else { - const std::string &s = c.get(); + const string &s = c.get(); if(s.empty()) throw lexical_error("conversion of '' to character"); if(s.size()>1)