X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstrings%2Futils.cpp;h=fff6cdb290362cb724b96b61c29f68c5970dfe0c;hp=5728332d595c1bba62d126f9ddbee776c6164004;hb=a268ee8d1990eca21155137d0245b2985579d064;hpb=b42ed73a1b241c0e93ee03c43c4584b41c549bac

diff --git a/source/strings/utils.cpp b/source/strings/utils.cpp
index 5728332..fff6cdb 100644
--- a/source/strings/utils.cpp
+++ b/source/strings/utils.cpp
@@ -1,13 +1,6 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2008 Mikko Rasa
-Distributed under the LGPL
-*/
-
 #include <algorithm>
 #include <list>
-#include <msp/core/except.h>
+#include <stdexcept>
 #include "utils.h"
 
 using namespace std;
@@ -155,7 +148,7 @@ string c_unescape(const std::string &str)
 			else if(*i>='A' && *i<='F')
 				digit = *i-'A'+10;
 			else
-				throw InvalidParameterValue("Invalid hexadecimal digit");
+				throw invalid_argument("c_unescape");
 
 			numeric_value = (numeric_value<<4 | digit);
 			++numeric_pos;
@@ -171,7 +164,7 @@ string c_unescape(const std::string &str)
 			if(*i>='0' && *i<='7')
 				digit = *i-'0';
 			else
-				throw InvalidParameterValue("Invalid octal digit");
+				throw invalid_argument("c_unescape");
 
 			numeric_value = (numeric_value<<3 | digit);
 			++numeric_pos;
@@ -216,7 +209,7 @@ string c_unescape(const std::string &str)
 			else if(*i=='\\')
 				result += '\\';
 			else
-				throw InvalidParameterValue("Invalid escape sequence");
+				throw invalid_argument("c_unescape");
 
 			escape = false;
 		}
@@ -227,7 +220,7 @@ string c_unescape(const std::string &str)
 	}
 
 	if(escape)	
-		throw InvalidParameterValue("Stray backslash at end of string");
+		throw invalid_argument("c_unescape");
 
 	return result;
 }