Fixed up the old API stuff, and removed the util/value (since it's no longer needed)

CMakeLists.txt

@@ -103,6 +103,7 @@ if(VERBOSE)
 endif()
 
 include_directories(${YAML_CPP_SOURCE_DIR}/include)
+include_directories(${YAML_CPP_SOURCE_DIR}/src)
 
 
 ###

include/yaml-cpp/old-api/node.h

@@ -9,10 +9,10 @@
 #include "yaml-cpp/conversion.h"
 #include "yaml-cpp/dll.h"
 #include "yaml-cpp/exceptions.h"
-#include "yaml-cpp/iterator.h"
-#include "yaml-cpp/ltnode.h"
 #include "yaml-cpp/mark.h"
 #include "yaml-cpp/noncopyable.h"
+#include "yaml-cpp/old-api/iterator.h"
+#include "yaml-cpp/old-api/ltnode.h"
 #include <iostream>
 #include <map>
 #include <memory>

src/null.cpp

@@ -1,7 +1,7 @@
 #include "yaml-cpp/null.h"
 
 #if YAML_CPP_OLD_API
-#include "yaml-cpp/node.h"
+#include "yaml-cpp/old-api/node.h"
 #endif
 
 namespace YAML

src/old-api/aliasmanager.cpp

@@ -1,5 +1,5 @@
-#include "yaml-cpp/aliasmanager.h"
+#include "yaml-cpp/old-api/aliasmanager.h"
-#include "yaml-cpp/node.h"
+#include "yaml-cpp/old-api/node.h"
 #include <cassert>
 #include <sstream>
 

src/old-api/iterator.cpp

@@ -1,4 +1,4 @@
-#include "yaml-cpp/node.h"
+#include "yaml-cpp/old-api/node.h"
 #include "yaml-cpp/exceptions.h"
 #include "iterpriv.h"
 

src/old-api/node.cpp

@@ -1,14 +1,14 @@
-#include "yaml-cpp/node.h"
+#include "yaml-cpp/old-api/node.h"
-#include "iterpriv.h"
-#include "nodebuilder.h"
-#include "nodeownership.h"
-#include "scanner.h"
-#include "tag.h"
-#include "token.h"
 #include "yaml-cpp/aliasmanager.h"
 #include "yaml-cpp/emitfromevents.h"
 #include "yaml-cpp/emitter.h"
 #include "yaml-cpp/eventhandler.h"
+#include "old-api/iterpriv.h"
+#include "old-api/nodebuilder.h"
+#include "old-api/nodeownership.h"
+#include "scanner.h"
+#include "tag.h"
+#include "token.h"
 #include <cassert>
 #include <stdexcept>
 

src/old-api/nodebuilder.cpp

@@ -1,6 +1,6 @@
-#include "nodebuilder.h"
+#include "old-api/nodebuilder.h"
 #include "yaml-cpp/mark.h"
-#include "yaml-cpp/node.h"
+#include "yaml-cpp/old-api/node.h"
 #include <cassert>
 
 namespace YAML

src/old-api/nodeownership.cpp

@@ -1,5 +1,5 @@
-#include "nodeownership.h"
+#include "old-api/nodeownership.h"
-#include "yaml-cpp/node.h"
+#include "yaml-cpp/old-api/node.h"
 
 namespace YAML
 {

src/parser.cpp

@@ -1,8 +1,7 @@
 #include "yaml-cpp/parser.h"
-#include "directives.h"
 #include "yaml-cpp/eventhandler.h"
 #include "yaml-cpp/exceptions.h"
-#include "yaml-cpp/node.h"
+#include "directives.h"
 #include "scanner.h"
 #include "singledocparser.h"
 #include "tag.h"
@@ -11,6 +10,7 @@
 #include <cstdio>
 
 #if YAML_CPP_OLD_API
+#include "yaml-cpp/old-api/node.h"
 #include "old-api/nodebuilder.h"
 #endif
 

util/CMakeLists.txt

@@ -1,5 +1,2 @@
 add_executable(parse parse.cpp)
 target_link_libraries(parse yaml-cpp)
-
-add_executable(value value.cpp)
-target_link_libraries(value yaml-cpp)

util/value.cpp

@@ -1,10 +0,0 @@
-#include "yaml-cpp/yaml.h"
-#include <map>
-
-int main()
-{
-	YAML::Node node = YAML::Parse("{foo: bar, monkey: value}");
-	std::cout << node << "\n";
-	
-	return 0;
-}