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:
Matt Blair 2015-05-07 13:26:01 -04:00
parent 012baa7d62
commit 2703ef784d
5 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/yaml-cpp/node/detail/impl.h
View File

@ -22,9 +22,9 @@ struct get_idx {
}; };
template <typename Key> template <typename Key>
struct get_idx< struct get_idx<Key,
Key, typename std::enable_if<std::is_unsigned<Key>::value && typename std::enable_if<std::is_unsigned<Key>::value &&
!std::is_same<Key, bool>::value>::type> { !std::is_same<Key, bool>::value>::type> {
static node* get(const std::vector<node*>& sequence, const Key& key, static node* get(const std::vector<node*>& sequence, const Key& key,
shared_memory_holder /* pMemory */) { shared_memory_holder /* pMemory */) {
return key < sequence.size() ? sequence[key] : 0; return key < sequence.size() ? sequence[key] : 0;
@ -41,7 +41,7 @@ struct get_idx<
}; };
template <typename Key> template <typename Key>
struct get_idx<Key, typename std::enable_if<std::is_signed<Key>::value >::type> { struct get_idx<Key, typename std::enable_if<std::is_signed<Key>::value>::type> {
static node* get(const std::vector<node*>& sequence, const Key& key, static node* get(const std::vector<node*>& sequence, const Key& key,
shared_memory_holder pMemory) { shared_memory_holder pMemory) {
return key >= 0 ? get_idx<std::size_t>::get( return key >= 0 ? get_idx<std::size_t>::get(

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

@ -18,8 +18,8 @@ namespace detail {
struct iterator_value; struct iterator_value;
template <typename V> template <typename V>
class iterator_base class iterator_base : public std::iterator<std::forward_iterator_tag, V,
: public std::iterator<std::forward_iterator_tag, V, std::ptrdiff_t, V*, V> { std::ptrdiff_t, V*, V> {
private: private:
template <typename> template <typename>
@ -46,10 +46,13 @@ class iterator_base
template <class W> template <class W>
iterator_base(const iterator_base<W>& rhs, iterator_base(const iterator_base<W>& rhs,
typename std::enable_if<std::is_convertible<W*, V*>::value, typename std::enable_if<std::is_convertible<W*, V*>::value,
enabler>::type = enabler()) enabler>::type = enabler())
: m_iterator(rhs.m_iterator), m_pMemory(rhs.m_pMemory) {} : m_iterator(rhs.m_iterator), m_pMemory(rhs.m_pMemory) {}
iterator_base<V>& operator++() { ++m_iterator; return *this; } iterator_base<V>& operator++() {
++m_iterator;
return *this;
}
template <typename W> template <typename W>
bool operator==(const iterator_base<W>& rhs) { bool operator==(const iterator_base<W>& rhs) {
@ -70,9 +73,7 @@ class iterator_base
return value_type(); return value_type();
} }
proxy operator->() const { proxy operator->() const { return proxy(**this); }
return proxy(**this);
}
private: private:
base_type m_iterator; base_type m_iterator;

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

@ -66,9 +66,7 @@ class node {
m_pRef->set_data(*rhs.m_pRef); m_pRef->set_data(*rhs.m_pRef);
} }
void set_mark(const Mark& mark) { void set_mark(const Mark& mark) { m_pRef->set_mark(mark); }
m_pRef->set_mark(mark);
}
void set_type(NodeType::value type) { void set_type(NodeType::value type) {
if (type != NodeType::Undefined) if (type != NodeType::Undefined)

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

@ -53,9 +53,9 @@ struct node_iterator_type<const V> {
template <typename V> template <typename V>
class node_iterator_base class node_iterator_base
: public std::iterator< : public std::iterator<std::forward_iterator_tag, node_iterator_value<V>,
std::forward_iterator_tag, node_iterator_value<V>, std::ptrdiff_t, node_iterator_value<V>*,
std::ptrdiff_t, node_iterator_value<V>*, node_iterator_value<V> > { node_iterator_value<V> > {
private: private:
struct enabler {}; struct enabler {};
@ -90,7 +90,7 @@ class node_iterator_base
template <typename W> template <typename W>
node_iterator_base(const node_iterator_base<W>& rhs, node_iterator_base(const node_iterator_base<W>& rhs,
typename std::enable_if<std::is_convertible<W*, V*>::value, typename std::enable_if<std::is_convertible<W*, V*>::value,
enabler>::type = enabler()) enabler>::type = 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),
@ -117,7 +117,7 @@ class node_iterator_base
template <typename W> template <typename W>
bool operator!=(const node_iterator_base<W>& rhs) const { bool operator!=(const node_iterator_base<W>& rhs) const {
return !(*this==rhs); return !(*this == rhs);
} }
node_iterator_base<V>& operator++() { node_iterator_base<V>& operator++() {
@ -147,9 +147,7 @@ class node_iterator_base
return value_type(); return value_type();
} }
proxy operator->() const { proxy operator->() const { return proxy(**this); }
return proxy(**this);
}
MapIter increment_until_defined(MapIter it) { MapIter increment_until_defined(MapIter it) {
while (it != m_mapEnd && !is_defined(it)) while (it != m_mapEnd && !is_defined(it))

4
src/node_data.cpp
View File

@ -28,9 +28,7 @@ void node_data::mark_defined() {
m_isDefined = true; m_isDefined = true;
} }
void node_data::set_mark(const Mark& mark) { void node_data::set_mark(const Mark& mark) { m_mark = mark; }
m_mark = mark;
}
void node_data::set_type(NodeType::value type) { void node_data::set_type(NodeType::value type) {
if (type == NodeType::Undefined) { if (type == NodeType::Undefined) {