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

4
src/collectionstack.h
View File

@@ -12,14 +12,14 @@
namespace YAML {
struct CollectionType {
enum value { None, BlockMap, BlockSeq, FlowMap, FlowSeq, CompactMap };
enum value { NoCollection, BlockMap, BlockSeq, FlowMap, FlowSeq, CompactMap };
};
class CollectionStack {
public:
CollectionType::value GetCurCollectionType() const {
if (collectionStack.empty())
return CollectionType::None;
return CollectionType::NoCollection;
return collectionStack.top();
}