From 4d753ed9e4c4aa8d5b0dddeaa40a58d3ecee82c5 Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 19 Jul 2018 09:51:18 +0100 Subject: [PATCH] Added missing ValueTree::Iterator::operator== --- modules/juce_data_structures/values/juce_ValueTree.cpp | 10 ++++------ modules/juce_data_structures/values/juce_ValueTree.h | 7 ++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/juce_data_structures/values/juce_ValueTree.cpp b/modules/juce_data_structures/values/juce_ValueTree.cpp index 0c3da8075c..88ae58ab3d 100644 --- a/modules/juce_data_structures/values/juce_ValueTree.cpp +++ b/modules/juce_data_structures/values/juce_ValueTree.cpp @@ -863,21 +863,19 @@ ValueTree ValueTree::getChild (int index) const return {}; } -ValueTree::Iterator::Iterator (const ValueTree& v, bool isEnd) noexcept +ValueTree::Iterator::Iterator (const ValueTree& v, bool isEnd) : internal (v.object != nullptr ? (isEnd ? v.object->children.end() : v.object->children.begin()) : nullptr) { } -ValueTree::Iterator& ValueTree::Iterator::operator++() noexcept +ValueTree::Iterator& ValueTree::Iterator::operator++() { internal = static_cast (internal) + 1; return *this; } -bool ValueTree::Iterator::operator!= (const Iterator& other) const noexcept -{ - return internal != other.internal; -} +bool ValueTree::Iterator::operator== (const Iterator& other) const { return internal == other.internal; } +bool ValueTree::Iterator::operator!= (const Iterator& other) const { return internal != other.internal; } ValueTree ValueTree::Iterator::operator*() const { diff --git a/modules/juce_data_structures/values/juce_ValueTree.h b/modules/juce_data_structures/values/juce_ValueTree.h index 611d59b1e1..9e23c09b67 100644 --- a/modules/juce_data_structures/values/juce_ValueTree.h +++ b/modules/juce_data_structures/values/juce_ValueTree.h @@ -400,10 +400,11 @@ public: */ struct Iterator { - Iterator (const ValueTree&, bool isEnd) noexcept; - Iterator& operator++() noexcept; + Iterator (const ValueTree&, bool isEnd); + Iterator& operator++(); - bool operator!= (const Iterator&) const noexcept; + bool operator== (const Iterator&) const; + bool operator!= (const Iterator&) const; ValueTree operator*() const; using difference_type = std::ptrdiff_t;