Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

yaml-cpp fixes #8

Closed
wants to merge 1 commit into from
Closed

yaml-cpp fixes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/yaml/include/yaml-cpp/binary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <string>
#include <vector>

#include "yaml-cpp/dll.h"
#include "dll.h"

namespace YAML {
YAML_CPP_API std::string EncodeBase64(const unsigned char *data,
Expand Down
14 changes: 7 additions & 7 deletions libs/yaml/include/yaml-cpp/emitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#include <sstream>
#include <string>

#include "yaml-cpp/binary.h"
#include "yaml-cpp/dll.h"
#include "yaml-cpp/emitterdef.h"
#include "yaml-cpp/emittermanip.h"
#include "yaml-cpp/noncopyable.h"
#include "yaml-cpp/null.h"
#include "yaml-cpp/ostream_wrapper.h"
#include "binary.h"
#include "dll.h"
#include "emitterdef.h"
#include "emittermanip.h"
#include "noncopyable.h"
#include "null.h"
#include "ostream_wrapper.h"

namespace YAML {
class Binary;
Expand Down
4 changes: 2 additions & 2 deletions libs/yaml/include/yaml-cpp/exceptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#pragma once
#endif

#include "yaml-cpp/mark.h"
#include "yaml-cpp/traits.h"
#include "mark.h"
#include "traits.h"
#include <sstream>
#include <stdexcept>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion libs/yaml/include/yaml-cpp/mark.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once
#endif

#include "yaml-cpp/dll.h"
#include "dll.h"

namespace YAML {
struct YAML_CPP_API Mark {
Expand Down
12 changes: 6 additions & 6 deletions libs/yaml/include/yaml-cpp/node/convert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
#include <sstream>
#include <vector>

#include "yaml-cpp/binary.h"
#include "yaml-cpp/node/impl.h"
#include "yaml-cpp/node/iterator.h"
#include "yaml-cpp/node/node.h"
#include "yaml-cpp/node/type.h"
#include "yaml-cpp/null.h"
#include "../binary.h"
#include "impl.h"
#include "iterator.h"
#include "node.h"
#include "type.h"
#include "../null.h"

namespace YAML {
class Binary;
Expand Down
4 changes: 2 additions & 2 deletions libs/yaml/include/yaml-cpp/node/detail/impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#pragma once
#endif

#include "yaml-cpp/node/detail/node.h"
#include "yaml-cpp/node/detail/node_data.h"
#include "node.h"
#include "node_data.h"
#include <type_traits>

namespace YAML {
Expand Down
6 changes: 3 additions & 3 deletions libs/yaml/include/yaml-cpp/node/detail/iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#pragma once
#endif

#include "yaml-cpp/dll.h"
#include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/detail/node_iterator.h"
#include "../../dll.h"
#include "../ptr.h"
#include "node_iterator.h"
#include <cstddef>
#include <iterator>

Expand Down
2 changes: 1 addition & 1 deletion libs/yaml/include/yaml-cpp/node/detail/iterator_fwd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once
#endif

#include "yaml-cpp/dll.h"
#include "../../dll.h"
#include <list>
#include <utility>
#include <vector>
Expand Down
4 changes: 2 additions & 2 deletions libs/yaml/include/yaml-cpp/node/detail/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <set>

#include "yaml-cpp/dll.h"
#include "yaml-cpp/node/ptr.h"
#include "../../dll.h"
#include "../ptr.h"

namespace YAML {
namespace detail {
Expand Down
10 changes: 5 additions & 5 deletions libs/yaml/include/yaml-cpp/node/detail/node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#pragma once
#endif

#include "yaml-cpp/emitterstyle.h"
#include "yaml-cpp/dll.h"
#include "yaml-cpp/node/type.h"
#include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/detail/node_ref.h"
#include "../../emitterstyle.h"
#include "../../dll.h"
#include "../type.h"
#include "../ptr.h"
#include "node_ref.h"
#include <set>

namespace YAML {
Expand Down
10 changes: 5 additions & 5 deletions libs/yaml/include/yaml-cpp/node/detail/node_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
#include <utility>
#include <vector>

#include "yaml-cpp/dll.h"
#include "yaml-cpp/node/detail/node_iterator.h"
#include "yaml-cpp/node/iterator.h"
#include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/type.h"
#include "../../dll.h"
#include "node_iterator.h"
#include "../iterator.h"
#include "../ptr.h"
#include "../type.h"

namespace YAML {
namespace detail {
Expand Down
4 changes: 2 additions & 2 deletions libs/yaml/include/yaml-cpp/node/detail/node_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#pragma once
#endif

#include "yaml-cpp/dll.h"
#include "yaml-cpp/node/ptr.h"
#include "../../dll.h"
#include "../ptr.h"
#include <cstddef>
#include <iterator>
#include <memory>
Expand Down
8 changes: 4 additions & 4 deletions libs/yaml/include/yaml-cpp/node/detail/node_ref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#pragma once
#endif

#include "yaml-cpp/dll.h"
#include "yaml-cpp/node/type.h"
#include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/detail/node_data.h"
#include "../../dll.h"
#include "../type.h"
#include "../ptr.h"
#include "node_data.h"

namespace YAML {
namespace detail {
Expand Down
2 changes: 1 addition & 1 deletion libs/yaml/include/yaml-cpp/node/emit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <string>
#include <iosfwd>

#include "yaml-cpp/dll.h"
#include "../dll.h"

namespace YAML {
class Emitter;
Expand Down
10 changes: 5 additions & 5 deletions libs/yaml/include/yaml-cpp/node/impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
#define THROW(x)
#endif

#include "yaml-cpp/node/node.h"
#include "yaml-cpp/node/iterator.h"
#include "yaml-cpp/node/detail/memory.h"
#include "yaml-cpp/node/detail/node.h"
#include "yaml-cpp/exceptions.h"
#include "node.h"
#include "iterator.h"
#include "detail/memory.h"
#include "detail/node.h"
#include "../exceptions.h"
#include <string>

namespace YAML {
Expand Down
8 changes: 4 additions & 4 deletions libs/yaml/include/yaml-cpp/node/iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#pragma once
#endif

#include "yaml-cpp/dll.h"
#include "yaml-cpp/node/node.h"
#include "yaml-cpp/node/detail/iterator_fwd.h"
#include "yaml-cpp/node/detail/iterator.h"
#include "../dll.h"
#include "node.h"
#include "detail/iterator_fwd.h"
#include "detail/iterator.h"
#include <list>
#include <utility>
#include <vector>
Expand Down
14 changes: 7 additions & 7 deletions libs/yaml/include/yaml-cpp/node/node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

#include <stdexcept>

#include "yaml-cpp/dll.h"
#include "yaml-cpp/emitterstyle.h"
#include "yaml-cpp/mark.h"
#include "yaml-cpp/node/detail/bool_type.h"
#include "yaml-cpp/node/detail/iterator_fwd.h"
#include "yaml-cpp/node/ptr.h"
#include "yaml-cpp/node/type.h"
#include "../dll.h"
#include "../emitterstyle.h"
#include "../mark.h"
#include "../node/detail/bool_type.h"
#include "../node/detail/iterator_fwd.h"
#include "../node/ptr.h"
#include "../node/type.h"

namespace YAML {
namespace detail {
Expand Down
2 changes: 1 addition & 1 deletion libs/yaml/include/yaml-cpp/node/parse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <string>
#include <vector>

#include "yaml-cpp/dll.h"
#include "../dll.h"

namespace YAML {
class Node;
Expand Down
2 changes: 1 addition & 1 deletion libs/yaml/include/yaml-cpp/node/ptr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once
#endif

#include "yaml-cpp/dll.h"
#include "../dll.h"
#include <memory>

namespace YAML {
Expand Down
2 changes: 1 addition & 1 deletion libs/yaml/include/yaml-cpp/noncopyable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once
#endif

#include "yaml-cpp/dll.h"
#include "dll.h"

namespace YAML {
// this is basically boost::noncopyable
Expand Down
2 changes: 1 addition & 1 deletion libs/yaml/include/yaml-cpp/null.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once
#endif

#include "yaml-cpp/dll.h"
#include "dll.h"
#include <string>

namespace YAML {
Expand Down
2 changes: 1 addition & 1 deletion libs/yaml/include/yaml-cpp/ostream_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <string>
#include <vector>

#include "yaml-cpp/dll.h"
#include "dll.h"

namespace YAML {
class YAML_CPP_API ostream_wrapper {
Expand Down
4 changes: 2 additions & 2 deletions libs/yaml/include/yaml-cpp/parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <ios>
#include <memory>

#include "yaml-cpp/dll.h"
#include "yaml-cpp/noncopyable.h"
#include "dll.h"
#include "noncopyable.h"

namespace YAML {
class EventHandler;
Expand Down
24 changes: 12 additions & 12 deletions libs/yaml/include/yaml-cpp/yaml.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
#pragma once
#endif

#include "yaml-cpp/parser.h"
#include "yaml-cpp/emitter.h"
#include "yaml-cpp/emitterstyle.h"
#include "yaml-cpp/stlemitter.h"
#include "yaml-cpp/exceptions.h"
#include "parser.h"
#include "emitter.h"
#include "emitterstyle.h"
#include "stlemitter.h"
#include "exceptions.h"

#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"
#include "node/node.h"
#include "node/impl.h"
#include "node/convert.h"
#include "node/iterator.h"
#include "node/detail/impl.h"
#include "node/parse.h"
#include "node/emit.h"

#endif // YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
2 changes: 1 addition & 1 deletion src/save/YAML.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <iostream>

#include "yaml-cpp/yaml.h"
#include "../libs/yaml/include/yaml-cpp/yaml.h"
#include "Platform.h"

#include "Data.h"
Expand Down