3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-26 18:51:04 +08:00
Code Issues Projects Releases Wiki Activity

COMP: Improve const correctness for ValueIterators (#1056)

Browse Source 
The protected deref method had inconsistent interface
of being a const function that returned a non-const
reference.  Resolves #914.
This commit is contained in:
Hans Johnson 2019-10-17 12:52:13 -05:00 committed by Jordan Bayles
parent a955529e47
commit b082693b9e
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/json/value.h
View File

@ -772,7 +772,14 @@ public:
char const* memberName(char const** end) const; char const* memberName(char const** end) const;
protected: protected:
Value& deref() const; /*! Internal utility functions to assist with implementing
* other iterator functions. The const and non-const versions
* of the "deref" protected methods expose the protected
* current_ member variable in a way that can often be
* optimized away by the compiler.
*/
const Value& deref() const;
Value& deref();
void increment(); void increment();
@ -895,9 +902,13 @@ public:
return *this; return *this;
} }
reference operator*() const { return deref(); } /*! The return value of non-const iterators can be
* changed, so the these functions are not const
pointer operator->() const { return &deref(); } * because the returned references/pointers can be used
* to change state of the base class.
*/
reference operator*() { return deref(); }
pointer operator->() { return &deref(); }
}; };
inline void swap(Value& a, Value& b) { a.swap(b); } inline void swap(Value& a, Value& b) { a.swap(b); }

3
src/lib_json/json_valueiterator.inl
View File

@ -21,7 +21,8 @@ ValueIteratorBase::ValueIteratorBase(
const Value::ObjectValues::iterator& current) const Value::ObjectValues::iterator& current)
: current_(current), isNull_(false) {} : current_(current), isNull_(false) {}
Value& ValueIteratorBase::deref() const { return current_->second; } Value& ValueIteratorBase::deref() { return current_->second; }
const Value& ValueIteratorBase::deref() const { return current_->second; }
void ValueIteratorBase::increment() { ++current_; } void ValueIteratorBase::increment() { ++current_; }