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 minor things that used the old API, compiles/links/runs\!

Browse Source
This commit is contained in:
beder
2011-09-10 22:59:27 -05:00
parent 24c55b434a
commit 2851f5f8c9
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/yaml-cpp/null.h
View File

@@ -16,7 +16,9 @@ namespace YAML
inline bool operator == (const _Null&, const _Null&) { return true; } inline bool operator == (const _Null&, const _Null&) { return true; }
inline bool operator != (const _Null&, const _Null&) { return false; } inline bool operator != (const _Null&, const _Null&) { return false; }
#if YAML_CPP_OLD_API
YAML_CPP_API bool IsNull(const Node& node); YAML_CPP_API bool IsNull(const Node& node);
#endif
extern YAML_CPP_API _Null Null; extern YAML_CPP_API _Null Null;
} }

5
src/null.cpp
View File

@@ -1,12 +1,17 @@
#include "yaml-cpp/null.h" #include "yaml-cpp/null.h"
#if YAML_CPP_OLD_API
#include "yaml-cpp/node.h" #include "yaml-cpp/node.h"
#endif
namespace YAML namespace YAML
{ {
_Null Null; _Null Null;
#if YAML_CPP_OLD_API
bool IsNull(const Node& node) bool IsNull(const Node& node)
{ {
return node.Read(Null); return node.Read(Null);
} }
#endif
} }

1
test/new-api/parsertests.cpp
View File

@@ -3,5 +3,6 @@
namespace Test { namespace Test {
bool RunParserTests() bool RunParserTests()
{ {
return true;
} }
} }

5
util/parse.cpp
View File

@@ -37,14 +37,17 @@ public:
void parse(std::istream& input) void parse(std::istream& input)
{ {
try { try {
#if YAML_CPP_OLD_API
YAML::Parser parser(input); YAML::Parser parser(input);
YAML::Node doc; YAML::Node doc;
NullEventHandler handler;
while(parser.GetNextDocument(doc)) { while(parser.GetNextDocument(doc)) {
YAML::Emitter emitter; YAML::Emitter emitter;
emitter << doc; emitter << doc;
std::cout << emitter.c_str() << "\n"; std::cout << emitter.c_str() << "\n";
} }
#else
// TODO: Parse with new API
#endif
} catch(const YAML::Exception& e) { } catch(const YAML::Exception& e) {
std::cerr << e.what() << "\n"; std::cerr << e.what() << "\n";
} }