"vscode:/vscode.git/clone" did not exist on "bda41c70ddb124134935a90a0d51304d2ac035e8"
Commit 70e1eb3f authored by Jesse Beder's avatar Jesse Beder
Browse files

Fixed the #ifdefs for the api stuff

parent 77cc5458
......@@ -57,8 +57,6 @@ option(MSVC_STHREADED_RT "MSVC: Build with single-threaded static runtime libs (
###
if(YAML_CPP_BUILD_OLD_API)
set(API_DEFINE "#define YAML_CPP_OLD_API")
else()
set(API_DEFINE "#undef YAML_CPP_OLD_API")
endif()
configure_file(${YAML_CPP_SOURCE_DIR}/include/yaml-cpp/yaml.h.cmake ${YAML_CPP_SOURCE_DIR}/include/yaml-cpp/yaml.h @ONLY)
......
......@@ -5,6 +5,7 @@
#pragma once
#endif
#undef YAML_CPP_OLD_API
@API_DEFINE@
#include "yaml-cpp/parser.h"
......
#include "yaml-cpp/null.h"
#if YAML_CPP_OLD_API
#ifdef YAML_CPP_OLD_API
#include "yaml-cpp/old-api/node.h"
#endif
......@@ -8,7 +8,7 @@ namespace YAML
{
_Null Null;
#if YAML_CPP_OLD_API
#ifdef YAML_CPP_OLD_API
bool IsNull(const Node& node)
{
return node.Read(Null);
......
......@@ -9,7 +9,7 @@
#include <sstream>
#include <cstdio>
#if YAML_CPP_OLD_API
#ifdef YAML_CPP_OLD_API
#include "yaml-cpp/old-api/node.h"
#include "old-api/nodebuilder.h"
#endif
......@@ -58,7 +58,7 @@ namespace YAML
return true;
}
#if YAML_CPP_OLD_API
#ifdef YAML_CPP_OLD_API
// GetNextDocument
// . Reads the next document in the queue (of tokens).
// . Throws a ParserException on error.
......
......@@ -37,7 +37,7 @@ public:
void parse(std::istream& input)
{
try {
#if YAML_CPP_OLD_API
#ifdef YAML_CPP_OLD_API
YAML::Parser parser(input);
YAML::Node doc;
while(parser.GetNextDocument(doc)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment