Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbeder merged 2 commits into from
Nov 29, 2017
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f6c4cd
Change None in C/C++ source to NoneType.
Nov 28, 2017
079acc0
Revert gtest modifications
Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions include/yaml-cpp/node/detail/node_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
namespace YAML {
namespace detail {
struct iterator_type {
enum value { None, Sequence, Map };
enum value { NoneType, Sequence, Map };
};

template <typename V>
Expand Down Expand Up @@ -73,7 +73,7 @@ class node_iterator_base
typedef node_iterator_value<V> 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),
Expand Down Expand Up @@ -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;
Expand All @@ -122,7 +122,7 @@ class node_iterator_base

node_iterator_base<V>& operator++() {
switch (m_type) {
case iterator_type::None:
case iterator_type::NoneType:
break;
case iterator_type::Sequence:
++m_seqIt;
Expand All @@ -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);
Expand Down