diff --git a/include/yaml-cpp/node/detail/node_iterator.h b/include/yaml-cpp/node/detail/node_iterator.h index 4337df4..088090f 100644 --- a/include/yaml-cpp/node/detail/node_iterator.h +++ b/include/yaml-cpp/node/detail/node_iterator.h @@ -19,7 +19,7 @@ namespace YAML { namespace detail { struct iterator_type { - enum value { None, Sequence, Map }; + enum value { NoneType, Sequence, Map }; }; template @@ -73,7 +73,7 @@ class node_iterator_base typedef node_iterator_value value_type; node_iterator_base() - : m_type(iterator_type::None), m_seqIt(), m_mapIt(), m_mapEnd() {} + : m_type(iterator_type::NoneType), m_seqIt(), m_mapIt(), m_mapEnd() {} explicit node_iterator_base(SeqIter seqIt) : m_type(iterator_type::Sequence), m_seqIt(seqIt), @@ -105,7 +105,7 @@ class node_iterator_base return false; switch (m_type) { - case iterator_type::None: + case iterator_type::NoneType: return true; case iterator_type::Sequence: return m_seqIt == rhs.m_seqIt; @@ -122,7 +122,7 @@ class node_iterator_base node_iterator_base& operator++() { switch (m_type) { - case iterator_type::None: + case iterator_type::NoneType: break; case iterator_type::Sequence: ++m_seqIt; @@ -143,7 +143,7 @@ class node_iterator_base value_type operator*() const { switch (m_type) { - case iterator_type::None: + case iterator_type::NoneType: return value_type(); case iterator_type::Sequence: return value_type(**m_seqIt);