peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 04:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change None in C/C++ source to NoneType. (#545)

Browse Source 
* Change None in C/C++ source to NoneType.

Prevent name conflict with X11 None definition.
This commit is contained in:
Cybel
2017-11-29 19:12:01 +00:00
committed by Jesse Beder
parent 752804372c
commit 86ae3a5aa7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/yaml-cpp/node/detail/node_iterator.h
View File

@@ -19,7 +19,7 @@
namespace YAML { namespace YAML {
namespace detail { namespace detail {
struct iterator_type { struct iterator_type {
enum value { None, Sequence, Map }; enum value { NoneType, Sequence, Map };
}; };
template <typename V> template <typename V>
@@ -73,7 +73,7 @@ class node_iterator_base
typedef node_iterator_value<V> value_type; typedef node_iterator_value<V> value_type;
node_iterator_base() 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) explicit node_iterator_base(SeqIter seqIt)
: m_type(iterator_type::Sequence), : m_type(iterator_type::Sequence),
m_seqIt(seqIt), m_seqIt(seqIt),
@@ -105,7 +105,7 @@ class node_iterator_base
return false; return false;
switch (m_type) { switch (m_type) {
case iterator_type::None: case iterator_type::NoneType:
return true; return true;
case iterator_type::Sequence: case iterator_type::Sequence:
return m_seqIt == rhs.m_seqIt; return m_seqIt == rhs.m_seqIt;
@@ -122,7 +122,7 @@ class node_iterator_base
node_iterator_base<V>& operator++() { node_iterator_base<V>& operator++() {
switch (m_type) { switch (m_type) {
case iterator_type::None: case iterator_type::NoneType:
break; break;
case iterator_type::Sequence: case iterator_type::Sequence:
++m_seqIt; ++m_seqIt;
@@ -143,7 +143,7 @@ class node_iterator_base
value_type operator*() const { value_type operator*() const {
switch (m_type) { switch (m_type) {
case iterator_type::None: case iterator_type::NoneType:
return value_type(); return value_type();
case iterator_type::Sequence: case iterator_type::Sequence:
return value_type(**m_seqIt); return value_type(**m_seqIt);