From 1f5e971f77cdb3a06185b7e134549cc52906da68 Mon Sep 17 00:00:00 2001 From: NameSirius Date: Mon, 5 Aug 2024 18:03:37 +0800 Subject: [PATCH] Fix compile warning with -Wshadow --- include/yaml-cpp/emitterstyle.h | 4 ++-- include/yaml-cpp/node/type.h | 4 ++-- src/singledocparser.cpp | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/yaml-cpp/emitterstyle.h b/include/yaml-cpp/emitterstyle.h index 67bb398..7497d35 100644 --- a/include/yaml-cpp/emitterstyle.h +++ b/include/yaml-cpp/emitterstyle.h @@ -8,8 +8,8 @@ #endif namespace YAML { -struct EmitterStyle { - enum value { Default, Block, Flow }; +namespace EmitterStyle { +enum value { Default, Block, Flow }; }; } diff --git a/include/yaml-cpp/node/type.h b/include/yaml-cpp/node/type.h index 9d55ca9..cc0901c 100644 --- a/include/yaml-cpp/node/type.h +++ b/include/yaml-cpp/node/type.h @@ -8,8 +8,8 @@ #endif namespace YAML { -struct NodeType { - enum value { Undefined, Null, Scalar, Sequence, Map }; +namespace NodeType { +enum value { Undefined, Null, Scalar, Sequence, Map }; }; } diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp index 22913d1..a8e949c 100644 --- a/src/singledocparser.cpp +++ b/src/singledocparser.cpp @@ -1,4 +1,3 @@ -#include #include #include @@ -93,8 +92,8 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { // add non-specific tags if (tag.empty()) tag = (token.type == Token::NON_PLAIN_SCALAR ? "!" : "?"); - - if (token.type == Token::PLAIN_SCALAR + + if (token.type == Token::PLAIN_SCALAR && tag.compare("?") == 0 && IsNullString(token.value)) { eventHandler.OnNull(mark, anchor); m_scanner.pop();