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

clang format

Browse Source
This commit is contained in:
Hannes Janetzek 2016-11-24 15:12:42 +01:00
parent 405d9784b5
commit 0d3f50ac55
5 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ typedef ref_holder<memory> shared_memory;
class YAML_CPP_API memory_holder : public ref_counted { class YAML_CPP_API memory_holder : public ref_counted {
public: public:
memory_holder(); memory_holder();
~memory_holder(); ~memory_holder();
node& create_node() { return m_pMemory->create_node(); } node& create_node() { return m_pMemory->create_node(); }
@ -47,11 +47,9 @@ class YAML_CPP_API memory_holder : public ref_counted {
private: private:
shared_memory m_pMemory; shared_memory m_pMemory;
}; };
typedef ref_holder<memory_holder> shared_memory_holder; typedef ref_holder<memory_holder> shared_memory_holder;
} }
} }

5
include/yaml-cpp/node/detail/node.h
View File

@ -19,11 +19,10 @@ namespace YAML {
namespace detail { namespace detail {
class node { class node {
using node_data_ref = ref_holder<node_data>; using node_data_ref = ref_holder<node_data>;
public: public:
node() : m_pRef(new node_data) {}
node() : m_pRef(new node_data){}
node(const node&) = delete; node(const node&) = delete;
node& operator=(const node&) = delete; node& operator=(const node&) = delete;

1
include/yaml-cpp/node/detail/node_data.h
View File

@ -121,7 +121,6 @@ class YAML_CPP_API node_data : public ref_counted {
typedef std::pair<node*, node*> kv_pair; typedef std::pair<node*, node*> kv_pair;
typedef std::list<kv_pair> kv_pairs; typedef std::list<kv_pair> kv_pairs;
mutable kv_pairs m_undefinedPairs; mutable kv_pairs m_undefinedPairs;
}; };
} }
} }

26
include/yaml-cpp/node/impl.h
View File

@ -15,9 +15,7 @@
#include <string> #include <string>
namespace YAML { namespace YAML {
inline Node::Node() inline Node::Node() : m_pMemory(new detail::memory_holder), m_pNode(NULL) {}
: m_pMemory(new detail::memory_holder),
m_pNode(NULL) {}
inline Node::Node(NodeType::value type) inline Node::Node(NodeType::value type)
: m_pMemory(new detail::memory_holder), : m_pMemory(new detail::memory_holder),
@ -33,26 +31,20 @@ inline Node::Node(const T& rhs)
} }
inline Node::Node(const detail::iterator_value& rhs) inline Node::Node(const detail::iterator_value& rhs)
: m_pMemory(rhs.m_pMemory), : m_pMemory(rhs.m_pMemory), m_pNode(rhs.m_pNode) {}
m_pNode(rhs.m_pNode) {}
inline Node::Node(const Node& rhs) inline Node::Node(const Node& rhs)
: m_pMemory(rhs.m_pMemory), : m_pMemory(rhs.m_pMemory), m_pNode(rhs.m_pNode) {}
m_pNode(rhs.m_pNode) {}
inline Node::Node(Zombie) inline Node::Node(Zombie) : m_pMemory(nullptr), m_pNode(NULL) {}
: m_pMemory(nullptr),
m_pNode(NULL) {}
inline Node::Node(Node&& rhs) inline Node::Node(Node&& rhs)
: m_pMemory(std::move(rhs.m_pMemory)), : m_pMemory(std::move(rhs.m_pMemory)), m_pNode(rhs.m_pNode) {
m_pNode(rhs.m_pNode) { rhs.m_pNode = nullptr;
rhs.m_pNode = nullptr;
} }
inline Node::Node(detail::node& node, detail::shared_memory_holder pMemory) inline Node::Node(detail::node& node, detail::shared_memory_holder pMemory)
: m_pMemory(pMemory), : m_pMemory(pMemory), m_pNode(&node) {}
m_pNode(&node) {}
inline Node::~Node() {} inline Node::~Node() {}
@ -392,8 +384,8 @@ inline const Node Node::operator[](const Key& key) const {
if (!isValid()) if (!isValid())
throw InvalidNode(); throw InvalidNode();
EnsureNodeExists(); EnsureNodeExists();
detail::node* value = static_cast<const detail::node&>(*m_pNode) detail::node* value = static_cast<const detail::node&>(*m_pNode).get(
.get(detail::to_value(key), m_pMemory); detail::to_value(key), m_pMemory);
if (!value) { if (!value) {
return Node(ZombieNode); return Node(ZombieNode);
} }

17
include/yaml-cpp/node/iterator.h
View File

@ -19,22 +19,23 @@ namespace YAML {
namespace detail { namespace detail {
struct iterator_value : public Node, std::pair<Node, Node> { struct iterator_value : public Node, std::pair<Node, Node> {
iterator_value() iterator_value()
: Node(Node::ZombieNode), : Node(Node::ZombieNode),
std::pair<Node, Node>(Node(Node::ZombieNode), Node(Node::ZombieNode)) {} std::pair<Node, Node>(Node(Node::ZombieNode), Node(Node::ZombieNode)) {}
explicit iterator_value(const Node& rhs) explicit iterator_value(const Node& rhs)
: Node(rhs), : Node(rhs),
std::pair<Node, Node>(Node(Node::ZombieNode), Node(Node::ZombieNode)) {} std::pair<Node, Node>(Node(Node::ZombieNode), Node(Node::ZombieNode)) {}
explicit iterator_value(const Node& key, const Node& value) explicit iterator_value(const Node& key, const Node& value)
: Node(Node::ZombieNode), std::pair<Node, Node>(key, value) {} : Node(Node::ZombieNode), std::pair<Node, Node>(key, value) {}
explicit iterator_value(Node&& rhs) explicit iterator_value(Node&& rhs)
: Node(std::move(rhs)), : Node(std::move(rhs)),
std::pair<Node, Node>(Node(Node::ZombieNode), Node(Node::ZombieNode)) {} std::pair<Node, Node>(Node(Node::ZombieNode), Node(Node::ZombieNode)) {}
explicit iterator_value(Node&& key, Node&& value) explicit iterator_value(Node&& key, Node&& value)
: Node(Node::ZombieNode), std::pair<Node, Node>(std::move(key), std::move(value)) {} : Node(Node::ZombieNode),
std::pair<Node, Node>(std::move(key), std::move(value)) {}
}; };
} }
} }