X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstrings%2Futils.cpp;h=fff6cdb290362cb724b96b61c29f68c5970dfe0c;hb=bff25a255af05f1ddd6c956a97fa6b8c50c9b22d;hp=93bbbbf2ae81d3c073b2abe3320029108ccd45ba;hpb=967785734be5c3fc6f75da122c2d93ebbb338271;p=libs%2Fcore.git

diff --git a/source/strings/utils.cpp b/source/strings/utils.cpp
index 93bbbbf..fff6cdb 100644
--- a/source/strings/utils.cpp
+++ b/source/strings/utils.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <list>
-#include <msp/core/except.h>
+#include <stdexcept>
 #include "utils.h"
 
 using namespace std;
@@ -148,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;
@@ -164,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;
@@ -209,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;
 		}
@@ -220,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;
 }