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

Fixed handler macros to remove warnings in gcc

Browse Source
This commit is contained in:
Jesse Beder
2012-05-23 15:12:36 -05:00
parent 288c7e51f2
commit f011975769
1 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
test/handlermacros.h
View File

@@ -155,56 +155,36 @@ namespace Test {
MockEventHandler handler;\ MockEventHandler handler;\
std::stringstream stream(ex);\ std::stringstream stream(ex);\
YAML::Parser parser(stream);\ YAML::Parser parser(stream);\
while(parser.HandleNextDocument(handler))\ while(parser.HandleNextDocument(handler)) {}
#define EXPECT_DOC_START()\ #define EXPECT_DOC_START()\
do {\ handler.Expect(Event(Event::DocStart, "", 0, ""))
handler.Expect(Event(Event::DocStart, "", 0, ""));\
} while(false)
#define EXPECT_DOC_END()\ #define EXPECT_DOC_END()\
do {\ handler.Expect(Event(Event::DocEnd, "", 0, ""))
handler.Expect(Event(Event::DocEnd, "", 0, ""));\
} while(false)
#define EXPECT_NULL(anchor)\ #define EXPECT_NULL(anchor)\
do {\ handler.Expect(Event(Event::Null, "", anchor, ""))
handler.Expect(Event(Event::Null, "", anchor, ""));\
} while(false)
#define EXPECT_ALIAS(anchor)\ #define EXPECT_ALIAS(anchor)\
do {\ handler.Expect(Event(Event::Alias, "", anchor, ""))
handler.Expect(Event(Event::Alias, "", anchor, ""));\
} while(false)
#define EXPECT_SCALAR(tag, anchor, value)\ #define EXPECT_SCALAR(tag, anchor, value)\
do {\ handler.Expect(Event(Event::Scalar, tag, anchor, value))
handler.Expect(Event(Event::Scalar, tag, anchor, value));\
} while(false)
#define EXPECT_SEQ_START(tag, anchor)\ #define EXPECT_SEQ_START(tag, anchor)\
do {\ handler.Expect(Event(Event::SeqStart, tag, anchor, ""))
handler.Expect(Event(Event::SeqStart, tag, anchor, ""));\
} while(false)
#define EXPECT_SEQ_END()\ #define EXPECT_SEQ_END()\
do {\ handler.Expect(Event(Event::SeqEnd, "", 0, ""))
handler.Expect(Event(Event::SeqEnd, "", 0, ""));\
} while(false)
#define EXPECT_MAP_START(tag, anchor)\ #define EXPECT_MAP_START(tag, anchor)\
do {\ handler.Expect(Event(Event::MapStart, tag, anchor, ""))
handler.Expect(Event(Event::MapStart, tag, anchor, ""));\
} while(false)
#define EXPECT_MAP_END()\ #define EXPECT_MAP_END()\
do {\ handler.Expect(Event(Event::MapEnd, "", 0, ""))
handler.Expect(Event(Event::MapEnd, "", 0, ""));\
} while(false)
#define DONE()\ #define DONE()\
do {\ return handler.Check()
return handler.Check();\
} while(false)
} }