generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-05-03 15:58:22 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #736 from maxim-ky/master

Browse Source 
Move the existing value to "removed" argument; removed is optional (could be nullptr)
This commit is contained in:
Christopher Dunn 2018-01-29 21:13:47 -06:00 committed by GitHub
commit 07a324fb14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib_json/json_value.cpp
View File

@ -1186,7 +1186,12 @@ bool Value::removeMember(const char* key, const char* cend, Value* removed)
ObjectValues::iterator it = value_.map_->find(actualKey); ObjectValues::iterator it = value_.map_->find(actualKey);
if (it == value_.map_->end()) if (it == value_.map_->end())
return false; return false;
if (removed)
#if JSON_HAS_RVALUE_REFERENCES
*removed = std::move(it->second);
#else
*removed = it->second; *removed = it->second;
#endif
value_.map_->erase(it); value_.map_->erase(it);
return true; return true;
} }