generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-06 10:55:57 +02:00
Code Issues Projects Releases Wiki Activity

drop this-> (team preference)

Browse Source
This commit is contained in:
Christopher Dunn 2015-01-21 15:43:48 -06:00
parent e893625e88
commit 05c1b8344d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib_json/json_value.cpp
View File

@ -1019,7 +1019,7 @@ Value Value::removeMember(const std::string& key) {
} }
bool Value::removeIndex(ArrayIndex index, Value* removed) { bool Value::removeIndex(ArrayIndex index, Value* removed) {
if (this->type_ != arrayValue) { if (type_ != arrayValue) {
return false; return false;
} }
#ifdef JSON_VALUE_USE_INTERNAL_MAP #ifdef JSON_VALUE_USE_INTERNAL_MAP
@ -1027,21 +1027,21 @@ bool Value::removeIndex(ArrayIndex index, Value* removed) {
return false; return false;
#else #else
CZString key(index); CZString key(index);
ObjectValues::iterator it = this->value_.map_->find(key); ObjectValues::iterator it = value_.map_->find(key);
if (it == this->value_.map_->end()) { if (it == value_.map_->end()) {
return false; return false;
} }
*removed = it->second; *removed = it->second;
ArrayIndex oldSize = this->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++){
CZString key(i); CZString key(i);
(*this->value_.map_)[key] = (*this)[i+1]; (*value_.map_)[key] = (*this)[i+1];
} }
// erase the last one ("leftover") // erase the last one ("leftover")
CZString keyLast(oldSize-1); CZString keyLast(oldSize-1);
ObjectValues::iterator itLast = this->value_.map_->find(keyLast); ObjectValues::iterator itLast = value_.map_->find(keyLast);
this->value_.map_->erase(itLast); value_.map_->erase(itLast);
return true; return true;
#endif #endif
} }