X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Farticlenumber.cpp;h=dd19eb5710e1ab0b7d1d719ef0969b1545cdd08f;hb=d4c2cc962dc4c7b11c2db360fef7a80de3334c11;hp=45e526ca18597056ed14c5dfc14134648a7c6fa0;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/libr2c2/articlenumber.cpp b/source/libr2c2/articlenumber.cpp
index 45e526c..dd19eb5 100644
--- a/source/libr2c2/articlenumber.cpp
+++ b/source/libr2c2/articlenumber.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/strings/utils.h>
 #include "articlenumber.h"
 
@@ -27,7 +20,7 @@ ArticleNumber::ArticleNumber(const string &s)
 	for(vector<string>::iterator i=sparts.begin(); i!=sparts.end(); ++i)
 	{
 		if(i->empty())
-			throw InvalidParameterValue("Malformed article number");
+			throw invalid_argument("ArticleNumber::ArticleNumber");
 
 		unsigned nondigit = i->size();
 		for(unsigned j=0; j<i->size(); ++j)
@@ -38,7 +31,7 @@ ArticleNumber::ArticleNumber(const string &s)
 			}
 
 		if(!nondigit || nondigit<i->size()-1)
-			throw InvalidParameterValue("Malformed article number");
+			throw invalid_argument("ArticleNumber::ArticleNumber");
 
 		Part part;
 		part.number = lexical_cast<unsigned>(i->substr(0, nondigit));
@@ -55,7 +48,7 @@ string ArticleNumber::str() const
 		if(!result.empty())
 			result += '-';
 
-		result += lexical_cast(i->number);
+		result += lexical_cast<string>(i->number);
 		if(i->letter)
 			result += i->letter;
 	}