clang-format

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

View File

@@ -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<unsigned char> DecodeBase64(const std::string &input);
class YAML_CPP_API Binary {

View File

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

View File

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

View File

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

View File

@@ -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);

View File

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

View File

@@ -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;

View File

@@ -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<bool>(node["foo"]));