mirror of
https://github.com/jbeder/yaml-cpp.git
synced 2025-09-09 20:51:16 +00:00
Renamed the None enumeration vaules to NoType to avoid a collision with X11's macro
This commit is contained in:
@@ -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;
|
||||
}
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user