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

Renamed the None enumeration vaules to NoType to avoid a collision with X11's macro

Browse Source
This commit is contained in:
Jesse Beder
2015-01-24 15:58:14 -06:00
parent 2b2e607118
commit 087e0673f3
5 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/emitterstate.cpp
View File

@@ -98,7 +98,7 @@ EmitterNodeType::value EmitterState::NextGroupType(
// can't happen
assert(false);
return EmitterNodeType::None;
return EmitterNodeType::NoType;
}
void EmitterState::StartedDoc() {
@@ -168,17 +168,17 @@ void EmitterState::EndedGroup(GroupType::value type) {
EmitterNodeType::value EmitterState::CurGroupNodeType() const {
if (m_groups.empty())
return EmitterNodeType::None;
return EmitterNodeType::NoType;
return m_groups.top().NodeType();
}
GroupType::value EmitterState::CurGroupType() const {
return m_groups.empty() ? GroupType::None : m_groups.top().type;
return m_groups.empty() ? GroupType::NoType : m_groups.top().type;
}
FlowType::value EmitterState::CurGroupFlowType() const {
return m_groups.empty() ? FlowType::None : m_groups.top().flowType;
return m_groups.empty() ? FlowType::NoType : m_groups.top().flowType;
}
int EmitterState::CurGroupIndent() const {