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

Revert "Fix compile warning with -Wshadow"

Browse Source 
This reverts commit 1f5e971f77.

See #1306; the previous commit caused an error with -Wpedantic:

yaml-cpp/include/yaml-cpp/emitterstyle.h:13:2: error: extra ‘;’ [-Wpedantic]

Since the original commit was to resolve warnings, reverting and the OP can produce a new one that fixes this issue.
This commit is contained in:
Jesse Beder
2024-08-05 15:50:36 -05:00
parent 1f5e971f77
commit 04dddd6999
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/yaml-cpp/emitterstyle.h
View File

@@ -8,8 +8,8 @@
#endif #endif
namespace YAML { namespace YAML {
namespace EmitterStyle { struct EmitterStyle {
enum value { Default, Block, Flow }; enum value { Default, Block, Flow };
}; };
} }

4
include/yaml-cpp/node/type.h
View File

@@ -8,8 +8,8 @@
#endif #endif
namespace YAML { namespace YAML {
namespace NodeType { struct NodeType {
enum value { Undefined, Null, Scalar, Sequence, Map }; enum value { Undefined, Null, Scalar, Sequence, Map };
}; };
} }

5
src/singledocparser.cpp
View File

@@ -1,3 +1,4 @@
#include <algorithm>
#include <cstdio> #include <cstdio>
#include <sstream> #include <sstream>
@@ -92,8 +93,8 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) {
// add non-specific tags // add non-specific tags
if (tag.empty()) if (tag.empty())
tag = (token.type == Token::NON_PLAIN_SCALAR ? "!" : "?"); 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)) { && tag.compare("?") == 0 && IsNullString(token.value)) {
eventHandler.OnNull(mark, anchor); eventHandler.OnNull(mark, anchor);
m_scanner.pop(); m_scanner.pop();