Fixed minor things that used the old API, compiles/links/runs\!

This commit is contained in:
Jesse Beder
2011-09-10 22:59:27 -05:00
parent f7b2247217
commit 80cf3c98db
4 changed files with 12 additions and 1 deletions

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 false; }
#if YAML_CPP_OLD_API
YAML_CPP_API bool IsNull(const Node& node);
#endif
extern YAML_CPP_API _Null Null;
}

View File

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

View File

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

View File

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