Unverified Commit 4571e817 authored by Pavel Karelin's avatar Pavel Karelin Committed by GitHub
Browse files

Fix compilation for Qt-projects (#918)

Not use 'emit' as variable name, in Qt Framework it reserved word
parent c82d3129
...@@ -16,8 +16,8 @@ namespace YAML { ...@@ -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) { ...@@ -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;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment