generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-02 17:50:53 +02:00
Code Issues Projects Releases Wiki Activity

fixed GH #2249: Poco::JSON::Object::set() should return reference to this to allow chaining

Browse Source
This commit is contained in:
Günter Obiltschnig 2018-03-27 11:47:05 +02:00
parent 35ba02e4a9
commit 5a1bf5eb4a
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
JSON/include/Poco/JSON/Array.h
View File

@ -172,10 +172,10 @@ public:
return value; return value;
} }
void add(const Dynamic::Var& value); Array& add(const Dynamic::Var& value);
/// Add the given value to the array /// Add the given value to the array
void set(unsigned int index, const Dynamic::Var& value); Array& set(unsigned int index, const Dynamic::Var& value);
/// Update the element on the given index to specified value /// Update the element on the given index to specified value
void stringify(std::ostream& out, unsigned int indent = 0, int step = -1) const; void stringify(std::ostream& out, unsigned int indent = 0, int step = -1) const;
@ -264,18 +264,20 @@ inline bool Array::isArray(ConstIterator& it) const
} }
inline void Array::add(const Dynamic::Var& value) inline Array& Array::add(const Dynamic::Var& value)
{ {
_values.push_back(value); _values.push_back(value);
_modified = true; _modified = true;
return *this;
} }
inline void Array::set(unsigned int index, const Dynamic::Var& value) inline Array& Array::set(unsigned int index, const Dynamic::Var& value)
{ {
if (index >= _values.size()) _values.resize(index + 1); if (index >= _values.size()) _values.resize(index + 1);
_values[index] = value; _values[index] = value;
_modified = true; _modified = true;
return *this;
} }

2
JSON/include/Poco/JSON/Object.h
View File

@ -209,7 +209,7 @@ public:
std::size_t size() const; std::size_t size() const;
/// Returns the number of properties. /// Returns the number of properties.
void set(const std::string& key, const Dynamic::Var& value); Object& set(const std::string& key, const Dynamic::Var& value);
/// Sets a new value. /// Sets a new value.
void stringify(std::ostream& out, unsigned int indent = 0, int step = -1) const; void stringify(std::ostream& out, unsigned int indent = 0, int step = -1) const;

5
JSON/src/Object.cpp
View File

@ -199,7 +199,7 @@ const std::string& Object::getKey(KeyList::const_iterator& iter) const
} }
void Object::set(const std::string& key, const Dynamic::Var& value) Object& Object::set(const std::string& key, const Dynamic::Var& value)
{ {
std::pair<ValueMap::iterator, bool> ret = _values.insert(ValueMap::value_type(key, value)); std::pair<ValueMap::iterator, bool> ret = _values.insert(ValueMap::value_type(key, value));
if (!ret.second) ret.first->second = value; if (!ret.second) ret.first->second = value;
@ -209,11 +209,12 @@ void Object::set(const std::string& key, const Dynamic::Var& value)
KeyList::iterator end = _keys.end(); KeyList::iterator end = _keys.end();
for (; it != end; ++it) for (; it != end; ++it)
{ {
if (key == (*it)->first) return; if (key == (*it)->first) return *this;
} }
_keys.push_back(ret.first); _keys.push_back(ret.first);
} }
_modified = true; _modified = true;
return *this;
} }