Skip to content

L
libconfig
Commit a2b8f499 authored by hyperrealm's avatar hyperrealm
Browse files
Options

Fixed implementations of iterator operator== and operator!= 

(which were infinitely recursive).
parent cea2aee8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
lib/libconfig.h++
View file @ a2b8f499
...@@ -335,10 +335,10 @@ class LIBCONFIGXX_API SettingIterator ...@@ -335,10 +335,10 @@ class LIBCONFIGXX_API SettingIterator
// Equality comparison. // Equality comparison.
inline bool operator==(SettingIterator const &other) const inline bool operator==(SettingIterator const &other) const
{ return(_idx == other._idx); } { return((_setting == other._setting) && (_idx == other._idx)); }
inline bool operator!=(SettingIterator const &other) const inline bool operator!=(SettingIterator const &other) const
{ return(*this != other); } { return(!operator==(other)); }
bool operator<(SettingIterator const &other) const; bool operator<(SettingIterator const &other) const;
...@@ -390,10 +390,10 @@ class LIBCONFIGXX_API SettingConstIterator ...@@ -390,10 +390,10 @@ class LIBCONFIGXX_API SettingConstIterator
// Equality comparison. // Equality comparison.
bool operator==(SettingConstIterator const &other) const bool operator==(SettingConstIterator const &other) const
{ return(_idx == other._idx); } { return((_setting == other._setting) && (_idx == other._idx)); }
inline bool operator!=(SettingConstIterator const &other) const inline bool operator!=(SettingConstIterator const &other) const
{ return(*this != other); } { return(!operator==(other)); }
// Dereference operators. // Dereference operators.
inline Setting const & operator*() inline Setting const & operator*()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment