Skip to content

Commit 07a324f

Browse files
authored
Merge pull request open-source-parsers#736 from maxim-ky/master
Move the existing value to "removed" argument; removed is optional (could be nullptr)
2 parents 04abe38 + 1ec85c7 commit 07a324f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/lib_json/json_value.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,12 @@ bool Value::removeMember(const char* key, const char* cend, Value* removed)
11861186
ObjectValues::iterator it = value_.map_->find(actualKey);
11871187
if (it == value_.map_->end())
11881188
return false;
1189-
*removed = it->second;
1189+
if (removed)
1190+
#if JSON_HAS_RVALUE_REFERENCES
1191+
*removed = std::move(it->second);
1192+
#else
1193+
*removed = it->second;
1194+
#endif
11901195
value_.map_->erase(it);
11911196
return true;
11921197
}

0 commit comments

Comments
 (0)