Use C++11 features with containers

[libs/core.git] / source / stringcodec / utf16.cpp

diff --git a/source/stringcodec/utf16.cpp b/source/stringcodec/utf16.cpp
index 09fb3b6f76c80a214b882bbf105405b68a5ec9a2..13d49ad4ed6250e1a9e95ee5084e20f424608796 100644 (file)
--- a/source/stringcodec/utf16.cpp
+++ b/source/stringcodec/utf16.cpp
@@ -66,7 +66,7 @@ unichar Utf16::Decoder::decode_char(const string &str, string::const_iterator &i
        if(i==str.end())
                return -1;
 
-       string::const_iterator j = i;
+       auto j = i;
 
        unichar unit = decode_unit(str, i, j);
        if(unit!=-1)
@@ -97,7 +97,7 @@ unichar Utf16::Decoder::decode_char(const string &str, string::const_iterator &i
        {
                if(unit>=0xD800 && unit<=0xDBFF)
                {
-                       string::const_iterator k = j;
+                       auto k = j;
 
                        unichar unit2 = -2;
                        if(k!=str.end())