From 13130ec20d0afcea5c0dcbf95b165403ffc9a8e8 Mon Sep 17 00:00:00 2001 From: Jesse Beder Date: Tue, 25 Mar 2014 00:11:17 -0500 Subject: [PATCH] clang-format --- include/yaml-cpp/binary.h | 3 ++- include/yaml-cpp/node/convert.h | 3 ++- include/yaml-cpp/node/detail/iterator.h | 7 +++---- include/yaml-cpp/node/detail/node_iterator.h | 13 ++++--------- include/yaml-cpp/node/node.h | 4 +--- include/yaml-cpp/node/type.h | 8 +------- src/nodeevents.cpp | 4 ++-- test/node/node_test.cpp | 2 +- 8 files changed, 16 insertions(+), 28 deletions(-) diff --git a/include/yaml-cpp/binary.h b/include/yaml-cpp/binary.h index adb2b36..d236a0c 100644 --- a/include/yaml-cpp/binary.h +++ b/include/yaml-cpp/binary.h @@ -13,7 +13,8 @@ #include "yaml-cpp/dll.h" namespace YAML { -YAML_CPP_API std::string EncodeBase64(const unsigned char *data, std::size_t size); +YAML_CPP_API std::string EncodeBase64(const unsigned char *data, + std::size_t size); YAML_CPP_API std::vector DecodeBase64(const std::string &input); class YAML_CPP_API Binary { diff --git a/include/yaml-cpp/node/convert.h b/include/yaml-cpp/node/convert.h index 65d5c6c..c942533 100644 --- a/include/yaml-cpp/node/convert.h +++ b/include/yaml-cpp/node/convert.h @@ -23,7 +23,8 @@ namespace YAML { class Binary; struct _Null; -template struct convert; +template +struct convert; } // namespace YAML namespace YAML { diff --git a/include/yaml-cpp/node/detail/iterator.h b/include/yaml-cpp/node/detail/iterator.h index 6c0d4b6..2c701af 100644 --- a/include/yaml-cpp/node/detail/iterator.h +++ b/include/yaml-cpp/node/detail/iterator.h @@ -36,10 +36,9 @@ class iterator_base : iterator_base::iterator_adaptor_(rhs), m_pMemory(pMemory) {} template - iterator_base( - const iterator_base& rhs, - typename boost::enable_if, enabler>::type = - enabler()) + iterator_base(const iterator_base& rhs, + typename boost::enable_if, + enabler>::type = enabler()) : iterator_base::iterator_adaptor_(rhs.base()), m_pMemory(rhs.m_pMemory) {} diff --git a/include/yaml-cpp/node/detail/node_iterator.h b/include/yaml-cpp/node/detail/node_iterator.h index 6147f63..2382d4a 100644 --- a/include/yaml-cpp/node/detail/node_iterator.h +++ b/include/yaml-cpp/node/detail/node_iterator.h @@ -18,11 +18,7 @@ namespace YAML { namespace detail { struct iterator_type { - enum value { - None, - Sequence, - Map - }; + enum value { None, Sequence, Map }; }; template @@ -76,10 +72,9 @@ class node_iterator_base } template - node_iterator_base( - const node_iterator_base& rhs, - typename boost::enable_if, enabler>::type = - enabler()) + node_iterator_base(const node_iterator_base& rhs, + typename boost::enable_if, + enabler>::type = enabler()) : m_type(rhs.m_type), m_seqIt(rhs.m_seqIt), m_mapIt(rhs.m_mapIt), diff --git a/include/yaml-cpp/node/node.h b/include/yaml-cpp/node/node.h index 8942aa5..a7e7ff8 100644 --- a/include/yaml-cpp/node/node.h +++ b/include/yaml-cpp/node/node.h @@ -104,9 +104,7 @@ class YAML_CPP_API Node { void force_insert(const Key& key, const Value& value); private: - enum Zombie { - ZombieNode - }; + enum Zombie { ZombieNode }; explicit Node(Zombie); explicit Node(detail::node& node, detail::shared_memory_holder pMemory); diff --git a/include/yaml-cpp/node/type.h b/include/yaml-cpp/node/type.h index da1bc11..9d55ca9 100644 --- a/include/yaml-cpp/node/type.h +++ b/include/yaml-cpp/node/type.h @@ -9,13 +9,7 @@ namespace YAML { struct NodeType { - enum value { - Undefined, - Null, - Scalar, - Sequence, - Map - }; + enum value { Undefined, Null, Scalar, Sequence, Map }; }; } diff --git a/src/nodeevents.cpp b/src/nodeevents.cpp index 38fa4d7..f70199d 100644 --- a/src/nodeevents.cpp +++ b/src/nodeevents.cpp @@ -11,8 +11,8 @@ void NodeEvents::AliasManager::RegisterReference(const detail::node& node) { m_anchorByIdentity.insert(std::make_pair(node.ref(), _CreateNewAnchor())); } -anchor_t NodeEvents::AliasManager::LookupAnchor(const detail::node& node) - const { +anchor_t NodeEvents::AliasManager::LookupAnchor( + const detail::node& node) const { AnchorByIdentity::const_iterator it = m_anchorByIdentity.find(node.ref()); if (it == m_anchorByIdentity.end()) return 0; diff --git a/test/node/node_test.cpp b/test/node/node_test.cpp index 5d66e75..b9d1aa8 100644 --- a/test/node/node_test.cpp +++ b/test/node/node_test.cpp @@ -232,7 +232,7 @@ TEST(NodeTest, Bool) { } TEST(NodeTest, AutoBoolConversion) { -#pragma warning(disable:4800) +#pragma warning(disable : 4800) YAML::Node node; node["foo"] = "bar"; EXPECT_TRUE(static_cast(node["foo"]));