generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-18 03:29:46 +02:00
Code Issues Projects Releases Wiki Activity

remove JSON_HAS_RVALUE_REFERENCES

Browse Source
This commit is contained in:
Billy Donahue
2019-01-21 12:32:31 -05:00
committed by Hans Johnson
parent 00558b38db
commit 9a55d22d3d
4 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib_json/json_value.cpp
View File

@@ -276,12 +276,10 @@ Value::CZString::CZString(const CZString& other) {
storage_.length_ = other.storage_.length_;
}
#if JSON_HAS_RVALUE_REFERENCES
Value::CZString::CZString(CZString&& other)
: cstr_(other.cstr_), index_(other.index_) {
other.cstr_ = nullptr;
}
#endif
Value::CZString::~CZString() {
if (cstr_ && storage_.policy_ == duplicate) {
@@ -304,14 +302,12 @@ Value::CZString& Value::CZString::operator=(const CZString& other) {
return *this;
}
#if JSON_HAS_RVALUE_REFERENCES
Value::CZString& Value::CZString::operator=(CZString&& other) {
cstr_ = other.cstr_;
index_ = other.index_;
other.cstr_ = nullptr;
return *this;
}
#endif
bool Value::CZString::operator<(const CZString& other) const {
if (!cstr_)
@@ -1169,11 +1165,9 @@ Value const& Value::operator[](CppTL::ConstString const& key) const {
Value& Value::append(const Value& value) { return (*this)[size()] = value; }
#if JSON_HAS_RVALUE_REFERENCES
Value& Value::append(Value&& value) {
return (*this)[size()] = std::move(value);
}
#endif
Value Value::get(char const* begin,
char const* end,
@@ -1198,11 +1192,7 @@ bool Value::removeMember(const char* begin, const char* end, Value* removed) {
if (it == value_.map_->end())
return false;
if (removed)
#if JSON_HAS_RVALUE_REFERENCES
*removed = std::move(it->second);
#else
*removed = it->second;
#endif
value_.map_->erase(it);
return true;
}