Skip to content

Commit 86ae3a5

Browse files
Cybeljbeder
authored andcommitted
Change None in C/C++ source to NoneType. (#545)
* Change None in C/C++ source to NoneType. Prevent name conflict with X11 None definition.
1 parent 7528043 commit 86ae3a5

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

include/yaml-cpp/node/detail/node_iterator.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace YAML {
2020
namespace detail {
2121
struct iterator_type {
22-
enum value { None, Sequence, Map };
22+
enum value { NoneType, Sequence, Map };
2323
};
2424

2525
template <typename V>
@@ -73,7 +73,7 @@ class node_iterator_base
7373
typedef node_iterator_value<V> value_type;
7474

7575
node_iterator_base()
76-
: m_type(iterator_type::None), m_seqIt(), m_mapIt(), m_mapEnd() {}
76+
: m_type(iterator_type::NoneType), m_seqIt(), m_mapIt(), m_mapEnd() {}
7777
explicit node_iterator_base(SeqIter seqIt)
7878
: m_type(iterator_type::Sequence),
7979
m_seqIt(seqIt),
@@ -105,7 +105,7 @@ class node_iterator_base
105105
return false;
106106

107107
switch (m_type) {
108-
case iterator_type::None:
108+
case iterator_type::NoneType:
109109
return true;
110110
case iterator_type::Sequence:
111111
return m_seqIt == rhs.m_seqIt;
@@ -122,7 +122,7 @@ class node_iterator_base
122122

123123
node_iterator_base<V>& operator++() {
124124
switch (m_type) {
125-
case iterator_type::None:
125+
case iterator_type::NoneType:
126126
break;
127127
case iterator_type::Sequence:
128128
++m_seqIt;
@@ -143,7 +143,7 @@ class node_iterator_base
143143

144144
value_type operator*() const {
145145
switch (m_type) {
146-
case iterator_type::None:
146+
case iterator_type::NoneType:
147147
return value_type();
148148
case iterator_type::Sequence:
149149
return value_type(**m_seqIt);

0 commit comments

Comments
 (0)