3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-27 11:21:02 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #804 from yantaozhao/master

Browse Source 
allow nullptr when not care the removed array value
This commit is contained in:
Christopher Dunn 2018-07-14 22:11:35 -05:00 committed by GitHub
commit 2baad4923e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/json/value.h
View File

@ -562,7 +562,7 @@ Json::Value obj_value(Json::objectValue); // {}
/** \brief Remove the indexed array element.
O(n) expensive operations.
Update 'removed' if removed.
Update 'removed' iff removed.
\return true if removed (no exceptions)
*/
bool removeIndex(ArrayIndex index, Value* removed);

3
src/lib_json/json_value.cpp
View File

@ -1243,7 +1243,8 @@ bool Value::removeIndex(ArrayIndex index, Value* removed) {
if (it == value_.map_->end()) {
return false;
}
*removed = it->second;
if (removed)
*removed = it->second;
ArrayIndex oldSize = size();
// shift left all items left, into the place of the "removed"
for (ArrayIndex i = index; i < (oldSize - 1); ++i) {