From 4571e8177a3ff833d773bc3ab2798b9368491821 Mon Sep 17 00:00:00 2001 From: Pavel Karelin Date: Tue, 14 Jul 2020 15:44:08 +0300 Subject: [PATCH] Fix compilation for Qt-projects (#918) Not use 'emit' as variable name, in Qt Framework it reserved word --- include/yaml-cpp/stlemitter.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/yaml-cpp/stlemitter.h b/include/yaml-cpp/stlemitter.h index 9cba257..210a2f6 100644 --- a/include/yaml-cpp/stlemitter.h +++ b/include/yaml-cpp/stlemitter.h @@ -16,8 +16,8 @@ namespace YAML { template inline Emitter& EmitSeq(Emitter& emitter, const Seq& seq) { emitter << BeginSeq; - for (const auto& emit : seq) - emitter << emit; + for (const auto& v : seq) + emitter << v; emitter << EndSeq; return emitter; } @@ -40,8 +40,8 @@ inline Emitter& operator<<(Emitter& emitter, const std::set& v) { template inline Emitter& operator<<(Emitter& emitter, const std::map& m) { emitter << BeginMap; - for (const auto& emit : m) - emitter << Key << emit.first << Value << emit.second; + for (const auto& v : m) + emitter << Key << v.first << Value << v.second; emitter << EndMap; return emitter; }