X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Fiso2022jp.cpp;h=93c50f489fb8486182a1f2b69711efea71d5e01e;hp=ebfe5f79acd210f61b7159900b0129ab899517a4;hb=HEAD;hpb=26636afce9c85c6c78c7267ebcd18d165825024b

diff --git a/source/stringcodec/iso2022jp.cpp b/source/stringcodec/iso2022jp.cpp
index ebfe5f7..93c50f4 100644
--- a/source/stringcodec/iso2022jp.cpp
+++ b/source/stringcodec/iso2022jp.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/except.h>
 #include "ascii.h"
 #include "iso2022jp.h"
 #include "jisx0201.h"
@@ -80,7 +81,6 @@ void Iso2022Jp::Encoder::transliterate(unichar, string &buf)
 
 Iso2022Jp::Decoder::Decoder(ErrorMode em):
 	Codec::Decoder(em),
-	mode(ASCII),
 	dec(new Ascii::Decoder)
 { }
 
@@ -91,7 +91,7 @@ unichar Iso2022Jp::Decoder::decode_char(const string &str, string::const_iterato
 
 	while(i!=str.end())
 	{
-		string::const_iterator j = i;
+		auto j = i;
 
 		unichar result = -1;
 		if(*j==033)
@@ -123,7 +123,7 @@ unichar Iso2022Jp::Decoder::decode_char(const string &str, string::const_iterato
 		else if(dec)
 			return dec->decode_char(str, i);
 		else
-			throw logic_error("no sub-decoder");
+			throw internal_error("no sub-decoder");
 
 		if(result>=0)
 			return result;