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

partially fix clang compilation (#893)

Browse Source 
* partially fix clang compilation

Missing header and mistaken algorithm usage.

Also removed it name from range loops. It's not correct.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

* run through clang's -Wrange-loop-analysis

Some range loops should not use references as they need to copy.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

* manual range loop conversions

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2020-06-15 14:59:27 -07:00
committed by GitHub
parent 6387cbc0ca
commit b2cd008717
7 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,8 +225,8 @@ template <typename K, typename V, typename C, typename A>
struct convert<std::map<K, V, C, A>> {
static Node encode(const std::map<K, V, C, A>& rhs) {
Node node(NodeType::Map);
for (const auto& it : rhs)
node.force_insert(it.first, it.second);
for (const auto& element : rhs)
node.force_insert(element.first, element.second);
return node;
}
@@ -235,12 +235,12 @@ struct convert<std::map<K, V, C, A>> {
return false;
rhs.clear();
for (const auto& it : node)
for (const auto& element : node)
#if defined(__GNUC__) && __GNUC__ < 4
// workaround for GCC 3:
rhs[it.first.template as<K>()] = it.second.template as<V>();
rhs[element.first.template as<K>()] = element.second.template as<V>();
#else
rhs[it.first.as<K>()] = it.second.as<V>();
rhs[element.first.as<K>()] = element.second.as<V>();
#endif
return true;
}
@@ -251,7 +251,8 @@ template <typename T, typename A>
struct convert<std::vector<T, A>> {
static Node encode(const std::vector<T, A>& rhs) {
Node node(NodeType::Sequence);
std::copy(rhs.begin(), rhs.end(), std::back_inserter(rhs));
for (const auto& element : rhs)
node.push_back(element);
return node;
}
@@ -260,12 +261,12 @@ struct convert<std::vector<T, A>> {
return false;
rhs.clear();
for (const auto& it : node)
for (const auto& element : node)
#if defined(__GNUC__) && __GNUC__ < 4
// workaround for GCC 3:
rhs.push_back(it.template as<T>());
rhs.push_back(element.template as<T>());
#else
rhs.push_back(it.as<T>());
rhs.push_back(element.as<T>());
#endif
return true;
}
@@ -276,7 +277,8 @@ template <typename T, typename A>
struct convert<std::list<T,A>> {
static Node encode(const std::list<T,A>& rhs) {
Node node(NodeType::Sequence);
std::copy(rhs.begin(), rhs.end(), std::back_inserter(rhs));
for (const auto& element : rhs)
node.push_back(element);
return node;
}
@@ -285,12 +287,12 @@ struct convert<std::list<T,A>> {
return false;
rhs.clear();
for (const auto& it : node)
for (const auto& element : node)
#if defined(__GNUC__) && __GNUC__ < 4
// workaround for GCC 3:
rhs.push_back(it.template as<T>());
rhs.push_back(element.template as<T>());
#else
rhs.push_back(it.as<T>());
rhs.push_back(element.as<T>());
#endif
return true;
}
@@ -301,7 +303,9 @@ template <typename T, std::size_t N>
struct convert<std::array<T, N>> {
static Node encode(const std::array<T, N>& rhs) {
Node node(NodeType::Sequence);
std::copy(rhs.begin(), rhs.end(), std::back_inserter(rhs));
for (const auto& element : rhs) {
node.push_back(element);
}
return node;
}

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

@@ -158,7 +158,7 @@ inline node& node_data::get(const Key& key, shared_memory_holder pMemory) {
});
if (it != m_map.end()) {
return it->second;
return *it->second;
}
node& k = convert_to_node(key, pMemory);

8
include/yaml-cpp/stlemitter.h
View File

@@ -16,8 +16,8 @@ namespace YAML {
template <typename Seq>
inline Emitter& EmitSeq(Emitter& emitter, const Seq& seq) {
emitter << BeginSeq;
for (typename Seq::const_iterator it = seq.begin(); it != seq.end(); ++it)
emitter << *it;
for (const auto& emit : seq)
emitter << emit;
emitter << EndSeq;
return emitter;
}
@@ -41,8 +41,8 @@ template <typename K, typename V>
inline Emitter& operator<<(Emitter& emitter, const std::map<K, V>& m) {
typedef typename std::map<K, V> map;
emitter << BeginMap;
for (typename map::const_iterator it = m.begin(); it != m.end(); ++it)
emitter << Key << it->first << Value << it->second;
for (const auto& emit : m)
emitter << Key << emit.first << Value << emit.second;
emitter << EndMap;
return emitter;
}