Moved all the includes to a subfolder yaml-cpp so they don't interfere with other libraries' includes

src/aliasmanager.cpp

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

src/content.cpp

@@ -1,5 +1,5 @@
 #include "content.h"
-#include "node.h"
+#include "yaml-cpp/node.h"
 #include <cassert>
 
 namespace YAML

src/content.h

@@ -4,8 +4,8 @@
 #define CONTENT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
 
-#include "anchor.h"
+#include "yaml-cpp/anchor.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 #include "ltnode.h"
 #include <map>
 #include <memory>

src/conversion.cpp

@@ -1,4 +1,4 @@
-#include "conversion.h"
+#include "yaml-cpp/conversion.h"
 #include <algorithm>
 
 ////////////////////////////////////////////////////////////////

src/emitfromevents.cpp

@@ -1,6 +1,6 @@
-#include "emitfromevents.h"
+#include "yaml-cpp/emitfromevents.h"
-#include "emitter.h"
+#include "yaml-cpp/emitter.h"
-#include "null.h"
+#include "yaml-cpp/null.h"
 #include <cassert>
 #include <sstream>
 

src/emitter.cpp

@@ -1,8 +1,8 @@
-#include "emitter.h"
+#include "yaml-cpp/emitter.h"
 #include "emitterstate.h"
 #include "emitterutils.h"
 #include "indentation.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 #include <sstream>
 
 namespace YAML

src/emitterstate.cpp

@@ -1,5 +1,5 @@
 #include "emitterstate.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 
 namespace YAML
 {

src/emitterstate.h

@@ -5,7 +5,7 @@
 
 
 #include "setting.h"
-#include "emittermanip.h"
+#include "yaml-cpp/emittermanip.h"
 #include <cassert>
 #include <vector>
 #include <stack>

src/emitterutils.cpp

@@ -1,7 +1,7 @@
 #include "emitterutils.h"
 #include "exp.h"
 #include "indentation.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 #include "stringsource.h"
 #include <sstream>
 #include <iomanip>

src/emitterutils.h

@@ -4,7 +4,7 @@
 #define EMITTERUTILS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
 
-#include "ostream.h"
+#include "yaml-cpp/ostream.h"
 #include <string>
 
 namespace YAML

src/exp.cpp

@@ -1,5 +1,5 @@
 #include "exp.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 #include <sstream>
 
 namespace YAML

src/indentation.h

@@ -4,7 +4,7 @@
 #define INDENTATION_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
 
-#include "ostream.h"
+#include "yaml-cpp/ostream.h"
 #include <iostream>
 
 namespace YAML

src/iterator.cpp

@@ -1,5 +1,5 @@
-#include "node.h"
+#include "yaml-cpp/node.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 #include "iterpriv.h"
 
 namespace YAML

src/map.cpp

@@ -1,7 +1,7 @@
 #include "map.h"
-#include "node.h"
+#include "yaml-cpp/node.h"
-#include "eventhandler.h"
+#include "yaml-cpp/eventhandler.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 
 namespace YAML
 {

src/node.cpp

@@ -1,14 +1,14 @@
-#include "node.h"
+#include "yaml-cpp/node.h"
 #include "aliascontent.h"
-#include "aliasmanager.h"
+#include "yaml-cpp/aliasmanager.h"
 #include "content.h"
-#include "emitfromevents.h"
+#include "yaml-cpp/emitfromevents.h"
-#include "emitter.h"
+#include "yaml-cpp/emitter.h"
-#include "eventhandler.h"
+#include "yaml-cpp/eventhandler.h"
 #include "iterpriv.h"
 #include "map.h"
 #include "nodebuilder.h"
-#include "nodeproperties.h"
+#include "yaml-cpp/nodeproperties.h"
 #include "scalar.h"
 #include "scanner.h"
 #include "sequence.h"

src/nodebuilder.cpp

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

src/nodebuilder.h

@@ -3,7 +3,7 @@
 #ifndef NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#include "eventhandler.h"
+#include "yaml-cpp/eventhandler.h"
 #include "ptr_stack.h"
 #include <map>
 #include <memory>

src/null.cpp

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

src/ostream.cpp

@@ -1,4 +1,4 @@
-#include "ostream.h"
+#include "yaml-cpp/ostream.h"
 #include <cstring>
 
 namespace YAML

src/parser.cpp

@@ -1,8 +1,8 @@
-#include "parser.h"
+#include "yaml-cpp/parser.h"
 #include "directives.h"
-#include "eventhandler.h"
+#include "yaml-cpp/eventhandler.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
-#include "node.h"
+#include "yaml-cpp/node.h"
 #include "nodebuilder.h"
 #include "scanner.h"
 #include "singledocparser.h"

src/ptr_stack.h

@@ -3,7 +3,7 @@
 #ifndef PTR_STACK_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define PTR_STACK_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#include "noncopyable.h"
+#include "yaml-cpp/noncopyable.h"
 #include <memory>
 #include <vector>
 

src/scalar.cpp

@@ -1,5 +1,5 @@
 #include "scalar.h"
-#include "eventhandler.h"
+#include "yaml-cpp/eventhandler.h"
 
 namespace YAML
 {

src/scanner.cpp

@@ -1,6 +1,6 @@
 #include "scanner.h"
 #include "token.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 #include "exp.h"
 #include <cassert>
 #include <memory>

src/scanscalar.cpp

@@ -1,7 +1,7 @@
 #include "scanscalar.h"
 #include "scanner.h"
 #include "exp.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 #include "token.h"
 
 namespace YAML

src/scantag.cpp

@@ -1,7 +1,7 @@
 #include "scanner.h"
 #include "regex.h"
 #include "exp.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 
 namespace YAML
 {

src/scantoken.cpp

@@ -1,6 +1,6 @@
 #include "scanner.h"
 #include "token.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 #include "exp.h"
 #include "scanscalar.h"
 #include "scantag.h"

src/sequence.cpp

@@ -1,6 +1,6 @@
 #include "sequence.h"
-#include "eventhandler.h"
+#include "yaml-cpp/eventhandler.h"
-#include "node.h"
+#include "yaml-cpp/node.h"
 #include <stdexcept>
 
 namespace YAML

src/setting.h

@@ -6,7 +6,7 @@
 
 #include <memory>
 #include <vector>
-#include "noncopyable.h"
+#include "yaml-cpp/noncopyable.h"
 
 namespace YAML
 {

src/simplekey.cpp

@@ -1,6 +1,6 @@
 #include "scanner.h"
 #include "token.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 #include "exp.h"
 
 namespace YAML

src/singledocparser.cpp

@@ -1,8 +1,8 @@
 #include "singledocparser.h"
 #include "collectionstack.h"
 #include "directives.h"
-#include "eventhandler.h"
+#include "yaml-cpp/eventhandler.h"
-#include "exceptions.h"
+#include "yaml-cpp/exceptions.h"
 #include "scanner.h"
 #include "tag.h"
 #include "token.h"

src/singledocparser.h

@@ -4,8 +4,8 @@
 #define SINGLEDOCPARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
 
-#include "anchor.h"
+#include "yaml-cpp/anchor.h"
-#include "noncopyable.h"
+#include "yaml-cpp/noncopyable.h"
 #include <string>
 #include <map>
 #include <memory>

src/stream.h

@@ -4,8 +4,8 @@
 #define STREAM_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
 
-#include "noncopyable.h"
+#include "yaml-cpp/noncopyable.h"
-#include "mark.h"
+#include "yaml-cpp/mark.h"
 #include <deque>
 #include <ios>
 #include <string>

src/streamcharsource.h

@@ -4,7 +4,7 @@
 #define STREAMCHARSOURCE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
 
-#include "noncopyable.h"
+#include "yaml-cpp/noncopyable.h"
 #include <cstddef>
 
 namespace YAML

src/token.h

@@ -4,7 +4,7 @@
 #define TOKEN_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
 
-#include "mark.h"
+#include "yaml-cpp/mark.h"
 #include <iostream>
 #include <string>
 #include <vector>

test/emittertests.cpp

@@ -1,5 +1,5 @@
 #include "tests.h"
-#include "yaml.h"
+#include "yaml-cpp/yaml.h"
 
 namespace Test
 {

test/parsertests.cpp

@@ -1,5 +1,5 @@
 #include "tests.h"
-#include "yaml.h"
+#include "yaml-cpp/yaml.h"
 #include <sstream>
 #include <algorithm>
 

test/spectests.cpp

@@ -1,5 +1,5 @@
 #include "spectests.h"
-#include "yaml.h"
+#include "yaml-cpp/yaml.h"
 #include <fstream>
 #include <sstream>
 #include <vector>

test/tests.cpp

@@ -2,7 +2,7 @@
 #include "emittertests.h"
 #include "parsertests.h"
 #include "spectests.h"
-#include "yaml.h"
+#include "yaml-cpp/yaml.h"
 #include <fstream>
 #include <sstream>
 #include <vector>

util/parse.cpp

@@ -1,4 +1,4 @@
-#include "yaml.h"
+#include "yaml-cpp/yaml.h"
 #include <fstream>
 #include <iostream>
 #include <vector>