generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 19:10:20 +01:00
Code Issues Projects Releases Wiki Activity

merge some changes from develop branch; modernize and clean-up code; remove support for compiling without POCO_WIN32_UTF8

Browse Source
This commit is contained in:
Günter Obiltschnig
2020-01-09 10:08:09 +01:00
parent 7c177b6f89
commit 1bf40a0cd2
389 changed files with 3029 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
JSON/src/Object.cpp
View File

@@ -42,10 +42,7 @@ Object::Object(const Object& other) : _values(other._values),
}
#ifdef POCO_ENABLE_CPP11
Object::Object(Object&& other) :
Object::Object(Object&& other):
_values(std::move(other._values)),
_keys(std::move(other._keys)),
_preserveInsOrder(other._preserveInsOrder),
@@ -57,25 +54,20 @@ Object::Object(Object&& other) :
}
Object &Object::operator= (Object &&other)
Object &Object::operator = (Object&& other)
{
if (&other != this)
{
_values = other._values;
_preserveInsOrder = other._preserveInsOrder;
syncKeys(other._keys);
_escapeUnicode = other._escapeUnicode;
_pStruct = !other._modified ? other._pStruct : 0;
_modified = other._modified;
other.clear();
}
_values = other._values;
_preserveInsOrder = other._preserveInsOrder;
syncKeys(other._keys);
_escapeUnicode = other._escapeUnicode;
_pStruct = !other._modified ? other._pStruct : 0;
_modified = other._modified;
other.clear();
return *this;
}
#endif // POCO_ENABLE_CPP11
Object::~Object()
{
}
@@ -224,9 +216,6 @@ Poco::DynamicStruct Object::makeStruct(const Object::Ptr& obj)
}
#ifdef POCO_ENABLE_CPP11
Poco::OrderedDynamicStruct Object::makeOrderedStruct(const Object::Ptr& obj)
{
return makeStructImpl<Poco::OrderedDynamicStruct>(obj);
@@ -242,7 +231,6 @@ void Object::resetOrdDynStruct() const
}
*/
#endif // POCO_ENABLE_CPP11
/*
void Object::resetDynStruct() const
@@ -286,9 +274,6 @@ Object::operator const Poco::DynamicStruct& () const
}
#ifdef POCO_ENABLE_CPP11
Object::operator const Poco::OrderedDynamicStruct& () const
{
if (!_values.size())
@@ -345,9 +330,6 @@ Object::operator const Poco::OrderedDynamicStruct& () const
}
#endif // POCO_ENABLE_CPP11
void Object::clear()
{
_values.clear();