From 0d3f50ac55cfbdaf895d2a9531ed187c8813c988 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Thu, 24 Nov 2016 15:12:42 +0100 Subject: [PATCH] clang format --- include/yaml-cpp/node/detail/memory.h | 4 +--- include/yaml-cpp/node/detail/node.h | 5 ++--- include/yaml-cpp/node/detail/node_data.h | 1 - include/yaml-cpp/node/impl.h | 26 ++++++++---------------- include/yaml-cpp/node/iterator.h | 17 ++++++++-------- 5 files changed, 21 insertions(+), 32 deletions(-) diff --git a/include/yaml-cpp/node/detail/memory.h b/include/yaml-cpp/node/detail/memory.h index f0a9bef..8189c54 100644 --- a/include/yaml-cpp/node/detail/memory.h +++ b/include/yaml-cpp/node/detail/memory.h @@ -39,7 +39,7 @@ typedef ref_holder shared_memory; class YAML_CPP_API memory_holder : public ref_counted { public: - memory_holder(); + memory_holder(); ~memory_holder(); node& create_node() { return m_pMemory->create_node(); } @@ -47,11 +47,9 @@ class YAML_CPP_API memory_holder : public ref_counted { private: shared_memory m_pMemory; - }; typedef ref_holder shared_memory_holder; - } } diff --git a/include/yaml-cpp/node/detail/node.h b/include/yaml-cpp/node/detail/node.h index 5cdea90..3eae868 100644 --- a/include/yaml-cpp/node/detail/node.h +++ b/include/yaml-cpp/node/detail/node.h @@ -19,11 +19,10 @@ namespace YAML { namespace detail { class node { - using node_data_ref = ref_holder; + using node_data_ref = ref_holder; public: - - node() : m_pRef(new node_data){} + node() : m_pRef(new node_data) {} node(const node&) = delete; node& operator=(const node&) = delete; diff --git a/include/yaml-cpp/node/detail/node_data.h b/include/yaml-cpp/node/detail/node_data.h index 33a2979..e6b4548 100644 --- a/include/yaml-cpp/node/detail/node_data.h +++ b/include/yaml-cpp/node/detail/node_data.h @@ -121,7 +121,6 @@ class YAML_CPP_API node_data : public ref_counted { typedef std::pair kv_pair; typedef std::list kv_pairs; mutable kv_pairs m_undefinedPairs; - }; } } diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h index 8c80ac4..421f577 100644 --- a/include/yaml-cpp/node/impl.h +++ b/include/yaml-cpp/node/impl.h @@ -15,9 +15,7 @@ #include namespace YAML { -inline Node::Node() - : m_pMemory(new detail::memory_holder), - m_pNode(NULL) {} +inline Node::Node() : m_pMemory(new detail::memory_holder), m_pNode(NULL) {} inline Node::Node(NodeType::value type) : m_pMemory(new detail::memory_holder), @@ -33,26 +31,20 @@ inline Node::Node(const T& rhs) } inline Node::Node(const detail::iterator_value& rhs) - : m_pMemory(rhs.m_pMemory), - m_pNode(rhs.m_pNode) {} + : m_pMemory(rhs.m_pMemory), m_pNode(rhs.m_pNode) {} inline Node::Node(const Node& rhs) - : m_pMemory(rhs.m_pMemory), - m_pNode(rhs.m_pNode) {} + : m_pMemory(rhs.m_pMemory), m_pNode(rhs.m_pNode) {} -inline Node::Node(Zombie) - : m_pMemory(nullptr), - m_pNode(NULL) {} +inline Node::Node(Zombie) : m_pMemory(nullptr), m_pNode(NULL) {} inline Node::Node(Node&& rhs) - : m_pMemory(std::move(rhs.m_pMemory)), - m_pNode(rhs.m_pNode) { - rhs.m_pNode = nullptr; + : m_pMemory(std::move(rhs.m_pMemory)), m_pNode(rhs.m_pNode) { + rhs.m_pNode = nullptr; } inline Node::Node(detail::node& node, detail::shared_memory_holder pMemory) - : m_pMemory(pMemory), - m_pNode(&node) {} + : m_pMemory(pMemory), m_pNode(&node) {} inline Node::~Node() {} @@ -392,8 +384,8 @@ inline const Node Node::operator[](const Key& key) const { if (!isValid()) throw InvalidNode(); EnsureNodeExists(); - detail::node* value = static_cast(*m_pNode) - .get(detail::to_value(key), m_pMemory); + detail::node* value = static_cast(*m_pNode).get( + detail::to_value(key), m_pMemory); if (!value) { return Node(ZombieNode); } diff --git a/include/yaml-cpp/node/iterator.h b/include/yaml-cpp/node/iterator.h index 8d4a1ac..d54e0c1 100644 --- a/include/yaml-cpp/node/iterator.h +++ b/include/yaml-cpp/node/iterator.h @@ -19,22 +19,23 @@ namespace YAML { namespace detail { struct iterator_value : public Node, std::pair { iterator_value() - : Node(Node::ZombieNode), - std::pair(Node(Node::ZombieNode), Node(Node::ZombieNode)) {} + : Node(Node::ZombieNode), + std::pair(Node(Node::ZombieNode), Node(Node::ZombieNode)) {} explicit iterator_value(const Node& rhs) - : Node(rhs), - std::pair(Node(Node::ZombieNode), Node(Node::ZombieNode)) {} + : Node(rhs), + std::pair(Node(Node::ZombieNode), Node(Node::ZombieNode)) {} explicit iterator_value(const Node& key, const Node& value) - : Node(Node::ZombieNode), std::pair(key, value) {} + : Node(Node::ZombieNode), std::pair(key, value) {} explicit iterator_value(Node&& rhs) - : Node(std::move(rhs)), - std::pair(Node(Node::ZombieNode), Node(Node::ZombieNode)) {} + : Node(std::move(rhs)), + std::pair(Node(Node::ZombieNode), Node(Node::ZombieNode)) {} explicit iterator_value(Node&& key, Node&& value) - : Node(Node::ZombieNode), std::pair(std::move(key), std::move(value)) {} + : Node(Node::ZombieNode), + std::pair(std::move(key), std::move(value)) {} }; } }