External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge acf5912d90 into ee99c4151c

Browse Source
This commit is contained in:
Dan D'Avella 2018-09-06 13:30:22 +00:00 committed by GitHub
commit 1ebc92124b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/yaml-cpp/node/node.h
View File

@ -113,7 +113,7 @@ class YAML_CPP_API Node {
template <typename Key, typename Value> template <typename Key, typename Value>
void force_insert(const Key& key, const Value& value); void force_insert(const Key& key, const Value& value);
private: protected:
enum Zombie { ZombieNode }; enum Zombie { ZombieNode };
explicit Node(Zombie); explicit Node(Zombie);
explicit Node(detail::node& node, detail::shared_memory_holder pMemory); explicit Node(detail::node& node, detail::shared_memory_holder pMemory);
@ -128,7 +128,7 @@ class YAML_CPP_API Node {
void AssignData(const Node& rhs); void AssignData(const Node& rhs);
void AssignNode(const Node& rhs); void AssignNode(const Node& rhs);
private: protected:
bool m_isValid; bool m_isValid;
mutable detail::shared_memory_holder m_pMemory; mutable detail::shared_memory_holder m_pMemory;
mutable detail::node* m_pNode; mutable detail::node* m_pNode;

4
src/nodebuilder.h → include/yaml-cpp/nodebuilder.h
View File

@ -47,13 +47,13 @@ class NodeBuilder : public EventHandler {
anchor_t anchor, EmitterStyle::value style); anchor_t anchor, EmitterStyle::value style);
virtual void OnMapEnd(); virtual void OnMapEnd();
private: protected:
detail::node& Push(const Mark& mark, anchor_t anchor); detail::node& Push(const Mark& mark, anchor_t anchor);
void Push(detail::node& node); void Push(detail::node& node);
void Pop(); void Pop();
void RegisterAnchor(anchor_t anchor, detail::node& node); void RegisterAnchor(anchor_t anchor, detail::node& node);
private: protected:
detail::shared_memory_holder m_pMemory; detail::shared_memory_holder m_pMemory;
detail::node* m_pRoot; detail::node* m_pRoot;

2
src/node.cpp
View File

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

2
src/nodebuilder.cpp
View File

@ -1,7 +1,7 @@
#include <assert.h> #include <assert.h>
#include <cassert> #include <cassert>
#include "nodebuilder.h" #include "yaml-cpp/nodebuilder.h"
#include "yaml-cpp/node/detail/node.h" #include "yaml-cpp/node/detail/node.h"
#include "yaml-cpp/node/impl.h" #include "yaml-cpp/node/impl.h"
#include "yaml-cpp/node/node.h" #include "yaml-cpp/node/node.h"

2
src/parse.cpp
View File

@ -6,7 +6,7 @@
#include "yaml-cpp/node/node.h" #include "yaml-cpp/node/node.h"
#include "yaml-cpp/node/impl.h" #include "yaml-cpp/node/impl.h"
#include "yaml-cpp/parser.h" #include "yaml-cpp/parser.h"
#include "nodebuilder.h" #include "yaml-cpp/nodebuilder.h"
namespace YAML { namespace YAML {
Node Load(const std::string& input) { Node Load(const std::string& input) {