X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Futf8.cpp;h=177386b65e7254a3624ad166f579de5bd4dcadb0;hp=c6d1990d0b00e6ae36870e8b0af7978f09cdb9fa;hb=f24e7b96e76b63c9b9b8a6bce4c7a9db64276ea8;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848

diff --git a/source/stringcodec/utf8.cpp b/source/stringcodec/utf8.cpp
index c6d1990..177386b 100644
--- a/source/stringcodec/utf8.cpp
+++ b/source/stringcodec/utf8.cpp
@@ -7,7 +7,7 @@ namespace StringCodec {
 
 void Utf8::Encoder::encode_char(unichar ch, string &buf)
 {
-	if(ch<0 || ch>0x10FFFF)
+	if(!is_valid_unichar(ch))
 		return error(ch, buf, invalid_character(ch, "UTF-8"));
 
 	unsigned bytes = 1;
@@ -59,7 +59,7 @@ unichar Utf8::Decoder::decode_char(const string &str, string::const_iterator &i)
 		for(; *i&mask; mask>>=1)
 			++bytes;
 
-		string::const_iterator j = i;
+		auto j = i;
 
 		unichar result = (*j++)&(mask-1);