generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-23 08:31:43 +02:00
Code Issues Projects Releases Wiki Activity

#2142 #2137 cherry pick 3

Browse Source
This commit is contained in:
Alex Fabijanic
2018-02-08 20:01:36 -06:00
parent fac2437fab
commit fc47df04cd
5 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JSON/src/Array.cpp
View File

@@ -26,7 +26,7 @@ namespace JSON {
Array::Array(int options): _modified(false),
_escapeUnicode(options & Poco::JSON_ESCAPE_UNICODE)
_escapeUnicode((options & Poco::JSON_ESCAPE_UNICODE) != 0)
{
}

11
JSON/src/Object.cpp
View File

@@ -26,8 +26,8 @@ namespace JSON {
Object::Object(int options):
_preserveInsOrder(options & Poco::JSON_PRESERVE_KEY_ORDER),
_escapeUnicode(options & Poco::JSON_ESCAPE_UNICODE),
_preserveInsOrder((options & Poco::JSON_PRESERVE_KEY_ORDER) != 0),
_escapeUnicode((options & Poco::JSON_ESCAPE_UNICODE) != 0),
_modified(false)
{
}
@@ -62,17 +62,13 @@ Object &Object::operator= (Object &&other)
{
if (&other != this)
{
<<<<<<< HEAD
_values = std::move(other._values);
_keys = std::move(other._keys);
=======
_values = other._values;
>>>>>>> df5968ce1... Json unicode escape && preserveOrder keys sync (#2145)
_preserveInsOrder = other._preserveInsOrder;
syncKeys(other._keys);
_escapeUnicode = other._escapeUnicode;
_pStruct = !other._modified ? other._pStruct : 0;
_modified = other._modified;
other.clear();
}
return *this;
}
@@ -96,7 +92,6 @@ Object &Object::operator= (const Object &other)
_escapeUnicode = other._escapeUnicode;
_pStruct = !other._modified ? other._pStruct : 0;
_modified = other._modified;
other.clear();
}
return *this;
}