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

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

View File

@@ -22,10 +22,10 @@ struct FmtScope {
enum value { Local, Global };
};
struct GroupType {
enum value { None, Seq, Map };
enum value { NoType, Seq, Map };
};
struct FlowType {
enum value { None, Flow, Block };
enum value { NoType, Flow, Block };
};
class EmitterState {
@@ -170,7 +170,7 @@ class EmitterState {
// can't get here
assert(false);
return EmitterNodeType::None;
return EmitterNodeType::NoType;
}
};