allow nullptr when not care the removed array value

This commit is contained in:
YantaoZhao 2018-07-03 21:29:18 +08:00
parent 80bc776bae
commit e32ee4717c
2 changed files with 3 additions and 2 deletions

View File

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

View File

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