From 2a256f2870f5849ebd9232f3521c28b89130ceb5 Mon Sep 17 00:00:00 2001 From: jbeder Date: Mon, 18 Oct 2010 07:05:53 +0000 Subject: [PATCH] Moved all the includes to a subfolder yaml-cpp so they don't interfere with other libraries' includes --- include/{ => yaml-cpp}/aliasmanager.h | 0 include/{ => yaml-cpp}/anchor.h | 0 include/{ => yaml-cpp}/conversion.h | 0 include/{ => yaml-cpp}/emitfromevents.h | 0 include/{ => yaml-cpp}/emitter.h | 0 include/{ => yaml-cpp}/emittermanip.h | 0 include/{ => yaml-cpp}/eventhandler.h | 0 include/{ => yaml-cpp}/exceptions.h | 0 include/{ => yaml-cpp}/iterator.h | 0 include/{ => yaml-cpp}/mark.h | 0 include/{ => yaml-cpp}/node.h | 0 include/{ => yaml-cpp}/nodeimpl.h | 0 include/{ => yaml-cpp}/nodeproperties.h | 0 include/{ => yaml-cpp}/nodereadimpl.h | 0 include/{ => yaml-cpp}/nodeutil.h | 0 include/{ => yaml-cpp}/noncopyable.h | 0 include/{ => yaml-cpp}/null.h | 0 include/{ => yaml-cpp}/ostream.h | 0 include/{ => yaml-cpp}/parser.h | 0 include/{ => yaml-cpp}/stlemitter.h | 0 include/{ => yaml-cpp}/stlnode.h | 0 include/{ => yaml-cpp}/traits.h | 0 include/{ => yaml-cpp}/yaml.h | 0 src/aliasmanager.cpp | 4 ++-- src/content.cpp | 2 +- src/content.h | 4 ++-- src/conversion.cpp | 2 +- src/emitfromevents.cpp | 6 +++--- src/emitter.cpp | 4 ++-- src/emitterstate.cpp | 2 +- src/emitterstate.h | 2 +- src/emitterutils.cpp | 2 +- src/emitterutils.h | 2 +- src/exp.cpp | 2 +- src/indentation.h | 2 +- src/iterator.cpp | 4 ++-- src/map.cpp | 6 +++--- src/node.cpp | 12 ++++++------ src/nodebuilder.cpp | 6 +++--- src/nodebuilder.h | 2 +- src/null.cpp | 4 ++-- src/ostream.cpp | 2 +- src/parser.cpp | 8 ++++---- src/ptr_stack.h | 2 +- src/scalar.cpp | 2 +- src/scanner.cpp | 2 +- src/scanscalar.cpp | 2 +- src/scantag.cpp | 2 +- src/scantoken.cpp | 2 +- src/sequence.cpp | 4 ++-- src/setting.h | 2 +- src/simplekey.cpp | 2 +- src/singledocparser.cpp | 4 ++-- src/singledocparser.h | 4 ++-- src/stream.h | 4 ++-- src/streamcharsource.h | 2 +- src/token.h | 2 +- test/emittertests.cpp | 2 +- test/parsertests.cpp | 2 +- test/spectests.cpp | 2 +- test/tests.cpp | 2 +- util/parse.cpp | 2 +- 62 files changed, 62 insertions(+), 62 deletions(-) rename include/{ => yaml-cpp}/aliasmanager.h (100%) rename include/{ => yaml-cpp}/anchor.h (100%) rename include/{ => yaml-cpp}/conversion.h (100%) rename include/{ => yaml-cpp}/emitfromevents.h (100%) rename include/{ => yaml-cpp}/emitter.h (100%) rename include/{ => yaml-cpp}/emittermanip.h (100%) rename include/{ => yaml-cpp}/eventhandler.h (100%) rename include/{ => yaml-cpp}/exceptions.h (100%) rename include/{ => yaml-cpp}/iterator.h (100%) rename include/{ => yaml-cpp}/mark.h (100%) rename include/{ => yaml-cpp}/node.h (100%) rename include/{ => yaml-cpp}/nodeimpl.h (100%) rename include/{ => yaml-cpp}/nodeproperties.h (100%) rename include/{ => yaml-cpp}/nodereadimpl.h (100%) rename include/{ => yaml-cpp}/nodeutil.h (100%) rename include/{ => yaml-cpp}/noncopyable.h (100%) rename include/{ => yaml-cpp}/null.h (100%) rename include/{ => yaml-cpp}/ostream.h (100%) rename include/{ => yaml-cpp}/parser.h (100%) rename include/{ => yaml-cpp}/stlemitter.h (100%) rename include/{ => yaml-cpp}/stlnode.h (100%) rename include/{ => yaml-cpp}/traits.h (100%) rename include/{ => yaml-cpp}/yaml.h (100%) diff --git a/include/aliasmanager.h b/include/yaml-cpp/aliasmanager.h similarity index 100% rename from include/aliasmanager.h rename to include/yaml-cpp/aliasmanager.h diff --git a/include/anchor.h b/include/yaml-cpp/anchor.h similarity index 100% rename from include/anchor.h rename to include/yaml-cpp/anchor.h diff --git a/include/conversion.h b/include/yaml-cpp/conversion.h similarity index 100% rename from include/conversion.h rename to include/yaml-cpp/conversion.h diff --git a/include/emitfromevents.h b/include/yaml-cpp/emitfromevents.h similarity index 100% rename from include/emitfromevents.h rename to include/yaml-cpp/emitfromevents.h diff --git a/include/emitter.h b/include/yaml-cpp/emitter.h similarity index 100% rename from include/emitter.h rename to include/yaml-cpp/emitter.h diff --git a/include/emittermanip.h b/include/yaml-cpp/emittermanip.h similarity index 100% rename from include/emittermanip.h rename to include/yaml-cpp/emittermanip.h diff --git a/include/eventhandler.h b/include/yaml-cpp/eventhandler.h similarity index 100% rename from include/eventhandler.h rename to include/yaml-cpp/eventhandler.h diff --git a/include/exceptions.h b/include/yaml-cpp/exceptions.h similarity index 100% rename from include/exceptions.h rename to include/yaml-cpp/exceptions.h diff --git a/include/iterator.h b/include/yaml-cpp/iterator.h similarity index 100% rename from include/iterator.h rename to include/yaml-cpp/iterator.h diff --git a/include/mark.h b/include/yaml-cpp/mark.h similarity index 100% rename from include/mark.h rename to include/yaml-cpp/mark.h diff --git a/include/node.h b/include/yaml-cpp/node.h similarity index 100% rename from include/node.h rename to include/yaml-cpp/node.h diff --git a/include/nodeimpl.h b/include/yaml-cpp/nodeimpl.h similarity index 100% rename from include/nodeimpl.h rename to include/yaml-cpp/nodeimpl.h diff --git a/include/nodeproperties.h b/include/yaml-cpp/nodeproperties.h similarity index 100% rename from include/nodeproperties.h rename to include/yaml-cpp/nodeproperties.h diff --git a/include/nodereadimpl.h b/include/yaml-cpp/nodereadimpl.h similarity index 100% rename from include/nodereadimpl.h rename to include/yaml-cpp/nodereadimpl.h diff --git a/include/nodeutil.h b/include/yaml-cpp/nodeutil.h similarity index 100% rename from include/nodeutil.h rename to include/yaml-cpp/nodeutil.h diff --git a/include/noncopyable.h b/include/yaml-cpp/noncopyable.h similarity index 100% rename from include/noncopyable.h rename to include/yaml-cpp/noncopyable.h diff --git a/include/null.h b/include/yaml-cpp/null.h similarity index 100% rename from include/null.h rename to include/yaml-cpp/null.h diff --git a/include/ostream.h b/include/yaml-cpp/ostream.h similarity index 100% rename from include/ostream.h rename to include/yaml-cpp/ostream.h diff --git a/include/parser.h b/include/yaml-cpp/parser.h similarity index 100% rename from include/parser.h rename to include/yaml-cpp/parser.h diff --git a/include/stlemitter.h b/include/yaml-cpp/stlemitter.h similarity index 100% rename from include/stlemitter.h rename to include/yaml-cpp/stlemitter.h diff --git a/include/stlnode.h b/include/yaml-cpp/stlnode.h similarity index 100% rename from include/stlnode.h rename to include/yaml-cpp/stlnode.h diff --git a/include/traits.h b/include/yaml-cpp/traits.h similarity index 100% rename from include/traits.h rename to include/yaml-cpp/traits.h diff --git a/include/yaml.h b/include/yaml-cpp/yaml.h similarity index 100% rename from include/yaml.h rename to include/yaml-cpp/yaml.h diff --git a/src/aliasmanager.cpp b/src/aliasmanager.cpp index 61443a9..89dfd03 100644 --- a/src/aliasmanager.cpp +++ b/src/aliasmanager.cpp @@ -1,5 +1,5 @@ -#include "aliasmanager.h" -#include "node.h" +#include "yaml-cpp/aliasmanager.h" +#include "yaml-cpp/node.h" #include #include diff --git a/src/content.cpp b/src/content.cpp index 208e988..a1540d1 100644 --- a/src/content.cpp +++ b/src/content.cpp @@ -1,5 +1,5 @@ #include "content.h" -#include "node.h" +#include "yaml-cpp/node.h" #include namespace YAML diff --git a/src/content.h b/src/content.h index 2c8cc8a..598b290 100644 --- a/src/content.h +++ b/src/content.h @@ -4,8 +4,8 @@ #define CONTENT_H_62B23520_7C8E_11DE_8A39_0800200C9A66 -#include "anchor.h" -#include "exceptions.h" +#include "yaml-cpp/anchor.h" +#include "yaml-cpp/exceptions.h" #include "ltnode.h" #include #include diff --git a/src/conversion.cpp b/src/conversion.cpp index 3b76ef2..f81e1a0 100644 --- a/src/conversion.cpp +++ b/src/conversion.cpp @@ -1,4 +1,4 @@ -#include "conversion.h" +#include "yaml-cpp/conversion.h" #include //////////////////////////////////////////////////////////////// diff --git a/src/emitfromevents.cpp b/src/emitfromevents.cpp index 7cbf42c..ce9c2ac 100644 --- a/src/emitfromevents.cpp +++ b/src/emitfromevents.cpp @@ -1,6 +1,6 @@ -#include "emitfromevents.h" -#include "emitter.h" -#include "null.h" +#include "yaml-cpp/emitfromevents.h" +#include "yaml-cpp/emitter.h" +#include "yaml-cpp/null.h" #include #include diff --git a/src/emitter.cpp b/src/emitter.cpp index 675fcf8..c036b8f 100644 --- a/src/emitter.cpp +++ b/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 namespace YAML diff --git a/src/emitterstate.cpp b/src/emitterstate.cpp index 2906679..1214ac5 100644 --- a/src/emitterstate.cpp +++ b/src/emitterstate.cpp @@ -1,5 +1,5 @@ #include "emitterstate.h" -#include "exceptions.h" +#include "yaml-cpp/exceptions.h" namespace YAML { diff --git a/src/emitterstate.h b/src/emitterstate.h index b5be269..87621b4 100644 --- a/src/emitterstate.h +++ b/src/emitterstate.h @@ -5,7 +5,7 @@ #include "setting.h" -#include "emittermanip.h" +#include "yaml-cpp/emittermanip.h" #include #include #include diff --git a/src/emitterutils.cpp b/src/emitterutils.cpp index 62a7ef3..c80b506 100644 --- a/src/emitterutils.cpp +++ b/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 #include diff --git a/src/emitterutils.h b/src/emitterutils.h index 7ceb6ff..3438745 100644 --- a/src/emitterutils.h +++ b/src/emitterutils.h @@ -4,7 +4,7 @@ #define EMITTERUTILS_H_62B23520_7C8E_11DE_8A39_0800200C9A66 -#include "ostream.h" +#include "yaml-cpp/ostream.h" #include namespace YAML diff --git a/src/exp.cpp b/src/exp.cpp index 8dd3479..a23f441 100644 --- a/src/exp.cpp +++ b/src/exp.cpp @@ -1,5 +1,5 @@ #include "exp.h" -#include "exceptions.h" +#include "yaml-cpp/exceptions.h" #include namespace YAML diff --git a/src/indentation.h b/src/indentation.h index 2e2c967..db382ef 100644 --- a/src/indentation.h +++ b/src/indentation.h @@ -4,7 +4,7 @@ #define INDENTATION_H_62B23520_7C8E_11DE_8A39_0800200C9A66 -#include "ostream.h" +#include "yaml-cpp/ostream.h" #include namespace YAML diff --git a/src/iterator.cpp b/src/iterator.cpp index 5d3bc9b..2b7742b 100644 --- a/src/iterator.cpp +++ b/src/iterator.cpp @@ -1,5 +1,5 @@ -#include "node.h" -#include "exceptions.h" +#include "yaml-cpp/node.h" +#include "yaml-cpp/exceptions.h" #include "iterpriv.h" namespace YAML diff --git a/src/map.cpp b/src/map.cpp index d9e799c..902b256 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,7 +1,7 @@ #include "map.h" -#include "node.h" -#include "eventhandler.h" -#include "exceptions.h" +#include "yaml-cpp/node.h" +#include "yaml-cpp/eventhandler.h" +#include "yaml-cpp/exceptions.h" namespace YAML { diff --git a/src/node.cpp b/src/node.cpp index a292bf7..7828ce5 100644 --- a/src/node.cpp +++ b/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 "emitter.h" -#include "eventhandler.h" +#include "yaml-cpp/emitfromevents.h" +#include "yaml-cpp/emitter.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" diff --git a/src/nodebuilder.cpp b/src/nodebuilder.cpp index 7da7d16..447ff87 100644 --- a/src/nodebuilder.cpp +++ b/src/nodebuilder.cpp @@ -1,7 +1,7 @@ #include "nodebuilder.h" -#include "mark.h" -#include "node.h" -#include "nodeproperties.h" +#include "yaml-cpp/mark.h" +#include "yaml-cpp/node.h" +#include "yaml-cpp/nodeproperties.h" #include namespace YAML diff --git a/src/nodebuilder.h b/src/nodebuilder.h index 004aaad..9ef6815 100644 --- a/src/nodebuilder.h +++ b/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 #include diff --git a/src/null.cpp b/src/null.cpp index faa05fb..08fa9aa 100644 --- a/src/null.cpp +++ b/src/null.cpp @@ -1,5 +1,5 @@ -#include "null.h" -#include "node.h" +#include "yaml-cpp/null.h" +#include "yaml-cpp/node.h" namespace YAML { diff --git a/src/ostream.cpp b/src/ostream.cpp index 463a450..a7f1e14 100644 --- a/src/ostream.cpp +++ b/src/ostream.cpp @@ -1,4 +1,4 @@ -#include "ostream.h" +#include "yaml-cpp/ostream.h" #include namespace YAML diff --git a/src/parser.cpp b/src/parser.cpp index 4d4b706..01afbd7 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -1,8 +1,8 @@ -#include "parser.h" +#include "yaml-cpp/parser.h" #include "directives.h" -#include "eventhandler.h" -#include "exceptions.h" -#include "node.h" +#include "yaml-cpp/eventhandler.h" +#include "yaml-cpp/exceptions.h" +#include "yaml-cpp/node.h" #include "nodebuilder.h" #include "scanner.h" #include "singledocparser.h" diff --git a/src/ptr_stack.h b/src/ptr_stack.h index 4a3b20b..cac785b 100644 --- a/src/ptr_stack.h +++ b/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 #include diff --git a/src/scalar.cpp b/src/scalar.cpp index 9383891..8bba6f7 100644 --- a/src/scalar.cpp +++ b/src/scalar.cpp @@ -1,5 +1,5 @@ #include "scalar.h" -#include "eventhandler.h" +#include "yaml-cpp/eventhandler.h" namespace YAML { diff --git a/src/scanner.cpp b/src/scanner.cpp index 2e5fef7..eb211f7 100644 --- a/src/scanner.cpp +++ b/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 #include diff --git a/src/scanscalar.cpp b/src/scanscalar.cpp index 50b8bf7..1adc469 100644 --- a/src/scanscalar.cpp +++ b/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 diff --git a/src/scantag.cpp b/src/scantag.cpp index f08218e..b71cbcc 100644 --- a/src/scantag.cpp +++ b/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 { diff --git a/src/scantoken.cpp b/src/scantoken.cpp index 3e7e1cc..768ed7f 100644 --- a/src/scantoken.cpp +++ b/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" diff --git a/src/sequence.cpp b/src/sequence.cpp index 60a0f14..41e3710 100644 --- a/src/sequence.cpp +++ b/src/sequence.cpp @@ -1,6 +1,6 @@ #include "sequence.h" -#include "eventhandler.h" -#include "node.h" +#include "yaml-cpp/eventhandler.h" +#include "yaml-cpp/node.h" #include namespace YAML diff --git a/src/setting.h b/src/setting.h index 5619c59..f11142b 100644 --- a/src/setting.h +++ b/src/setting.h @@ -6,7 +6,7 @@ #include #include -#include "noncopyable.h" +#include "yaml-cpp/noncopyable.h" namespace YAML { diff --git a/src/simplekey.cpp b/src/simplekey.cpp index d8d1932..857a9e0 100644 --- a/src/simplekey.cpp +++ b/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 diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp index 964212e..85844a3 100644 --- a/src/singledocparser.cpp +++ b/src/singledocparser.cpp @@ -1,8 +1,8 @@ #include "singledocparser.h" #include "collectionstack.h" #include "directives.h" -#include "eventhandler.h" -#include "exceptions.h" +#include "yaml-cpp/eventhandler.h" +#include "yaml-cpp/exceptions.h" #include "scanner.h" #include "tag.h" #include "token.h" diff --git a/src/singledocparser.h b/src/singledocparser.h index 19e670e..28355b8 100644 --- a/src/singledocparser.h +++ b/src/singledocparser.h @@ -4,8 +4,8 @@ #define SINGLEDOCPARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66 -#include "anchor.h" -#include "noncopyable.h" +#include "yaml-cpp/anchor.h" +#include "yaml-cpp/noncopyable.h" #include #include #include diff --git a/src/stream.h b/src/stream.h index 5d78551..952f6bf 100644 --- a/src/stream.h +++ b/src/stream.h @@ -4,8 +4,8 @@ #define STREAM_H_62B23520_7C8E_11DE_8A39_0800200C9A66 -#include "noncopyable.h" -#include "mark.h" +#include "yaml-cpp/noncopyable.h" +#include "yaml-cpp/mark.h" #include #include #include diff --git a/src/streamcharsource.h b/src/streamcharsource.h index 10debc8..12548a4 100644 --- a/src/streamcharsource.h +++ b/src/streamcharsource.h @@ -4,7 +4,7 @@ #define STREAMCHARSOURCE_H_62B23520_7C8E_11DE_8A39_0800200C9A66 -#include "noncopyable.h" +#include "yaml-cpp/noncopyable.h" #include namespace YAML diff --git a/src/token.h b/src/token.h index bf4f922..ba2eb59 100644 --- a/src/token.h +++ b/src/token.h @@ -4,7 +4,7 @@ #define TOKEN_H_62B23520_7C8E_11DE_8A39_0800200C9A66 -#include "mark.h" +#include "yaml-cpp/mark.h" #include #include #include diff --git a/test/emittertests.cpp b/test/emittertests.cpp index 58c3d92..b379e55 100644 --- a/test/emittertests.cpp +++ b/test/emittertests.cpp @@ -1,5 +1,5 @@ #include "tests.h" -#include "yaml.h" +#include "yaml-cpp/yaml.h" namespace Test { diff --git a/test/parsertests.cpp b/test/parsertests.cpp index 47b1d8b..7137aa7 100644 --- a/test/parsertests.cpp +++ b/test/parsertests.cpp @@ -1,5 +1,5 @@ #include "tests.h" -#include "yaml.h" +#include "yaml-cpp/yaml.h" #include #include diff --git a/test/spectests.cpp b/test/spectests.cpp index 9648d9e..d809b69 100644 --- a/test/spectests.cpp +++ b/test/spectests.cpp @@ -1,5 +1,5 @@ #include "spectests.h" -#include "yaml.h" +#include "yaml-cpp/yaml.h" #include #include #include diff --git a/test/tests.cpp b/test/tests.cpp index 492a5d1..b2c2d13 100644 --- a/test/tests.cpp +++ b/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 #include #include diff --git a/util/parse.cpp b/util/parse.cpp index 502e159..be8a58b 100644 --- a/util/parse.cpp +++ b/util/parse.cpp @@ -1,4 +1,4 @@ -#include "yaml.h" +#include "yaml-cpp/yaml.h" #include #include #include