Remove unnecessary std:: qualifiers

[libs/core.git] / source / strings / lexicalcast.cpp

diff --git a/source/strings/lexicalcast.cpp b/source/strings/lexicalcast.cpp
index ab83b110b432ba408f8bdfa3bd2fb53d3e848c8f..8789544bbb355f14f421ccd9a6ea5f761a25e256 100644 (file)
--- a/source/strings/lexicalcast.cpp
+++ b/source/strings/lexicalcast.cpp
@@ -108,12 +108,12 @@ string int_to_str(T v, const Fmt &f)
 }
 
 template<typename T>
-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()<fmt.get_width())
        {
                if(fmt.get_align()==Fmt::RIGHT)
@@ -482,6 +483,13 @@ void LexicalConverter::result(const string &s)
                buf = s;
 }
 
+const string &LexicalConverter::get() const
+{
+       if(!filled)
+               throw lexical_error("conversion not performed");
+       return buf;
+}
+
 
 /*** operator<< ***/
 
@@ -556,7 +564,7 @@ void operator>>(const LexicalConverter &c, char &v)
                v = str_to_int<char>(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)