Add move semantics to Variant

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

diff --git a/source/stringcodec/utf16.cpp b/source/stringcodec/utf16.cpp
index fed994ef9e76d03dd6deaae0ee531911bd9da4e8..f8ae093a64e8e67d16a9e9897dd5e3e13063b4a6 100644 (file)
--- a/source/stringcodec/utf16.cpp
+++ b/source/stringcodec/utf16.cpp
@@ -7,8 +7,7 @@ namespace StringCodec {
 
 Utf16::Encoder::Encoder(ErrorMode em, Endian en):
        Codec::Encoder(em),
-       endian(en==AUTO ? BIG : en),
-       emit_bom(true)
+       endian(en==AUTO ? BIG : en)
 { }
 
 void Utf16::Encoder::encode_char(unichar ch, string &buf)
@@ -47,7 +46,7 @@ void Utf16::Encoder::encode_char(unichar ch, string &buf)
        }
 }
 
-void Utf16::Encoder::transliterate(unichar, std::string &buf)
+void Utf16::Encoder::transliterate(unichar, string &buf)
 {
        if(endian==LITTLE)
                buf.append("\xFD\xFF", 2);
@@ -66,7 +65,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 +96,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())