peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 20:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
Jesse Beder
2014-03-25 00:11:17 -05:00
parent dea3428ce0
commit 13130ec20d
8 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/yaml-cpp/binary.h
View File

@@ -13,7 +13,8 @@
#include "yaml-cpp/dll.h" #include "yaml-cpp/dll.h"
namespace YAML { 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<unsigned char> DecodeBase64(const std::string &input); YAML_CPP_API std::vector<unsigned char> DecodeBase64(const std::string &input);
class YAML_CPP_API Binary { class YAML_CPP_API Binary {

3
include/yaml-cpp/node/convert.h
View File

@@ -23,7 +23,8 @@
namespace YAML { namespace YAML {
class Binary; class Binary;
struct _Null; struct _Null;
template <typename T> struct convert; template <typename T>
struct convert;
} // namespace YAML } // namespace YAML
namespace YAML { namespace YAML {

7
include/yaml-cpp/node/detail/iterator.h
View File

@@ -36,10 +36,9 @@ class iterator_base
: iterator_base::iterator_adaptor_(rhs), m_pMemory(pMemory) {} : iterator_base::iterator_adaptor_(rhs), m_pMemory(pMemory) {}
template <class W> template <class W>
iterator_base( iterator_base(const iterator_base<W>& rhs,
const iterator_base<W>& rhs, typename boost::enable_if<boost::is_convertible<W*, V*>,
typename boost::enable_if<boost::is_convertible<W*, V*>, enabler>::type = enabler>::type = enabler())
enabler())
: iterator_base::iterator_adaptor_(rhs.base()), : iterator_base::iterator_adaptor_(rhs.base()),
m_pMemory(rhs.m_pMemory) {} m_pMemory(rhs.m_pMemory) {}

13
include/yaml-cpp/node/detail/node_iterator.h
View File

@@ -18,11 +18,7 @@
namespace YAML { namespace YAML {
namespace detail { namespace detail {
struct iterator_type { struct iterator_type {
enum value { enum value { None, Sequence, Map };
None,
Sequence,
Map
};
}; };
template <typename V> template <typename V>
@@ -76,10 +72,9 @@ class node_iterator_base
} }
template <typename W> template <typename W>
node_iterator_base( node_iterator_base(const node_iterator_base<W>& rhs,
const node_iterator_base<W>& rhs, typename boost::enable_if<boost::is_convertible<W*, V*>,
typename boost::enable_if<boost::is_convertible<W*, V*>, enabler>::type = enabler>::type = enabler())
enabler())
: m_type(rhs.m_type), : m_type(rhs.m_type),
m_seqIt(rhs.m_seqIt), m_seqIt(rhs.m_seqIt),
m_mapIt(rhs.m_mapIt), m_mapIt(rhs.m_mapIt),

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

@@ -104,9 +104,7 @@ class YAML_CPP_API Node {
void force_insert(const Key& key, const Value& value); void force_insert(const Key& key, const Value& value);
private: private:
enum Zombie { enum Zombie { ZombieNode };
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);

8
include/yaml-cpp/node/type.h
View File

@@ -9,13 +9,7 @@
namespace YAML { namespace YAML {
struct NodeType { struct NodeType {
enum value { enum value { Undefined, Null, Scalar, Sequence, Map };
Undefined,
Null,
Scalar,
Sequence,
Map
};
}; };
} }

4
src/nodeevents.cpp
View File

@@ -11,8 +11,8 @@ void NodeEvents::AliasManager::RegisterReference(const detail::node& node) {
m_anchorByIdentity.insert(std::make_pair(node.ref(), _CreateNewAnchor())); m_anchorByIdentity.insert(std::make_pair(node.ref(), _CreateNewAnchor()));
} }
anchor_t NodeEvents::AliasManager::LookupAnchor(const detail::node& node) anchor_t NodeEvents::AliasManager::LookupAnchor(
const { const detail::node& node) const {
AnchorByIdentity::const_iterator it = m_anchorByIdentity.find(node.ref()); AnchorByIdentity::const_iterator it = m_anchorByIdentity.find(node.ref());
if (it == m_anchorByIdentity.end()) if (it == m_anchorByIdentity.end())
return 0; return 0;

2
test/node/node_test.cpp
View File

@@ -232,7 +232,7 @@ TEST(NodeTest, Bool) {
} }
TEST(NodeTest, AutoBoolConversion) { TEST(NodeTest, AutoBoolConversion) {
#pragma warning(disable:4800) #pragma warning(disable : 4800)
YAML::Node node; YAML::Node node;
node["foo"] = "bar"; node["foo"] = "bar";
EXPECT_TRUE(static_cast<bool>(node["foo"])); EXPECT_TRUE(static_cast<bool>(node["foo"]));