Put all the old-api stuff back in the main folder, for simplicity

CMakeLists.txt

@@ -56,18 +56,9 @@ option(MSVC_STHREADED_RT "MSVC: Build with single-threaded static runtime libs (
 ###
 set(header_directory "include/yaml-cpp/")
 
-file(GLOB common_sources "src/[a-zA-Z]*.cpp")
-file(GLOB old_api_sources "src/old-api/[a-zA-Z]*.cpp")
-
-file(GLOB common_public_headers "include/yaml-cpp/[a-zA-Z]*.h")
-file(GLOB old_api_public_headers "include/yaml-cpp/old-api/[a-zA-Z]*.h")
-
-file(GLOB common_private_headers "src/[a-zA-Z]*.h")
-file(GLOB old_api_private_headers "src/old-api/[a-zA-Z]*.h")
-
-list(APPEND sources ${common_sources} ${old_api_sources})
-list(APPEND public_headers ${common_public_headers} ${old_api_public_headers})
-list(APPEND private_headers ${common_private_headers} ${old_api_private_headers})
+file(GLOB sources "src/[a-zA-Z]*.cpp")
+file(GLOB public_headers "include/yaml-cpp/[a-zA-Z]*.h")
+file(GLOB private_headers "src/[a-zA-Z]*.h")
 
 if(YAML_CPP_BUILD_CONTRIB)
 	file(GLOB contrib_sources "src/contrib/[a-zA-Z]*.cpp")

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

@@ -10,9 +10,9 @@
 #include "yaml-cpp/exceptions.h"
 #include "yaml-cpp/mark.h"
 #include "yaml-cpp/noncopyable.h"
-#include "yaml-cpp/old-api/conversion.h"
-#include "yaml-cpp/old-api/iterator.h"
-#include "yaml-cpp/old-api/ltnode.h"
+#include "yaml-cpp/conversion.h"
+#include "yaml-cpp/iterator.h"
+#include "yaml-cpp/ltnode.h"
 #include <iostream>
 #include <map>
 #include <memory>
@@ -129,7 +129,7 @@ namespace YAML
 	};
 }
 
-#include "yaml-cpp/old-api/nodeimpl.h"
-#include "yaml-cpp/old-api/nodereadimpl.h"
+#include "yaml-cpp/nodeimpl.h"
+#include "yaml-cpp/nodereadimpl.h"
 
 #endif // NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/old-api/nodeimpl.h → include/yaml-cpp/nodeimpl.h

@@ -6,7 +6,7 @@
 #endif
 
 
-#include "yaml-cpp/old-api/nodeutil.h"
+#include "yaml-cpp/nodeutil.h"
 #include <cassert>
 
 namespace YAML

include/yaml-cpp/yaml.h.cmake

-#ifndef YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#undef YAML_CPP_OLD_API
-@API_DEFINE@
-
-#include "yaml-cpp/parser.h"
-#include "yaml-cpp/emitter.h"
-#include "yaml-cpp/stlemitter.h"
-#include "yaml-cpp/exceptions.h"
-
-#ifdef YAML_CPP_OLD_API
-
-#include "yaml-cpp/old-api/node.h"
-#include "yaml-cpp/old-api/stlnode.h"
-#include "yaml-cpp/old-api/iterator.h"
-
-#else
-
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/impl.h"
-#include "yaml-cpp/node/convert.h"
-#include "yaml-cpp/node/iterator.h"
-#include "yaml-cpp/node/detail/impl.h"
-#include "yaml-cpp/node/parse.h"
-#include "yaml-cpp/node/emit.h"
-
-#endif // YAML_CPP_OLD_API
-
-#endif // YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/old-api/aliasmanager.cpp → src/aliasmanager.cpp

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

src/old-api/conversion.cpp → src/conversion.cpp

-#include "yaml-cpp/old-api/conversion.h"
+#include "yaml-cpp/conversion.h"
 #include <algorithm>
 
 ////////////////////////////////////////////////////////////////

src/old-api/iterator.cpp → src/iterator.cpp

-#include "yaml-cpp/old-api/node.h"
+#include "yaml-cpp/node.h"
 #include "yaml-cpp/exceptions.h"
 #include "iterpriv.h"
 

src/old-api/iterpriv.h → src/iterpriv.h

@@ -6,7 +6,7 @@
 #endif
 
 
-#include "yaml-cpp/old-api/ltnode.h"
+#include "yaml-cpp/ltnode.h"
 #include <vector>
 #include <map>
 

src/old-api/node.cpp → src/node.cpp

-#include "yaml-cpp/old-api/node.h"
-#include "yaml-cpp/old-api/aliasmanager.h"
+#include "yaml-cpp/node.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 "iterpriv.h"
+#include "nodebuilder.h"
+#include "nodeownership.h"
 #include "scanner.h"
 #include "tag.h"
 #include "token.h"

src/old-api/nodebuilder.cpp → src/nodebuilder.cpp

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

src/old-api/nodeownership.cpp → src/nodeownership.cpp

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