X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstrings%2Fformat.cpp;h=4b5bcd0c43e2cf734a54dfd65c18f95b405c19cc;hb=e378c8f46af4cbc00e4c8b44ea2839b5ac6726ec;hp=dfd3800841033cbafba518b9b1417f193c30ab77;hpb=3a965c87750250c8facc9dbff02aeb3a88e19f05;p=libs%2Fcore.git diff --git a/source/strings/format.cpp b/source/strings/format.cpp index dfd3800..4b5bcd0 100644 --- a/source/strings/format.cpp +++ b/source/strings/format.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspstrings -Copyright © 2006-2007 Mikko Rasa -Distributed under the LGPL -*/ - #include "format.h" using namespace std; @@ -25,7 +18,7 @@ values have been fed to the formatter. const string &Formatter::str() const { if(pos!=fmt.end()) - throw Exception("Too few arguments for format"); + throw format_error("Too few arguments for format"); return result; } @@ -43,7 +36,7 @@ void Formatter::advance() { ++pos; if(pos==fmt.end()) - throw Exception("Malformed format string"); + throw format_error("Malformed format string"); if(*pos!='%') break; } @@ -59,7 +52,7 @@ Fmt object. Fmt Formatter::get_conversion() { if(pos==fmt.end()) - throw Exception("Too many arguments for format"); + throw format_error("Too many arguments for format"); string::iterator i = pos; for(; i!=fmt.end(); ++i) @@ -67,7 +60,7 @@ Fmt Formatter::get_conversion() break; if(i==fmt.end()) - throw Exception("Malformed format string"); + throw format_error("Malformed format string"); ++i; string c(pos, i);