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

Fix compilation for Qt-projects (#918)

Browse Source 
Not use 'emit' as variable name, in Qt Framework it reserved word
This commit is contained in:
Pavel Karelin
2020-07-14 15:44:08 +03:00
committed by GitHub
parent c82d3129dd
commit 4571e8177a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,8 @@ namespace YAML {
template <typename Seq> template <typename Seq>
inline Emitter& EmitSeq(Emitter& emitter, const Seq& seq) { inline Emitter& EmitSeq(Emitter& emitter, const Seq& seq) {
emitter << BeginSeq; emitter << BeginSeq;
for (const auto& emit : seq) for (const auto& v : seq)
emitter << emit; emitter << v;
emitter << EndSeq; emitter << EndSeq;
return emitter; return emitter;
} }
@@ -40,8 +40,8 @@ inline Emitter& operator<<(Emitter& emitter, const std::set<T>& v) {
template <typename K, typename V> template <typename K, typename V>
inline Emitter& operator<<(Emitter& emitter, const std::map<K, V>& m) { inline Emitter& operator<<(Emitter& emitter, const std::map<K, V>& m) {
emitter << BeginMap; emitter << BeginMap;
for (const auto& emit : m) for (const auto& v : m)
emitter << Key << emit.first << Value << emit.second; emitter << Key << v.first << Value << v.second;
emitter << EndMap; emitter << EndMap;
return emitter; return emitter;
} }