mirror of
https://github.com/jbeder/yaml-cpp.git
synced 2025-09-09 04:41:16 +00:00
Fixed warnings to compile on gcc with -Wall -pedantic -Wextra
This commit is contained in:
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
|
|||||||
|
|
||||||
project (YAML_CPP)
|
project (YAML_CPP)
|
||||||
|
|
||||||
SET(CMAKE_CXX_FLAGS "-O2")
|
SET(CMAKE_CXX_FLAGS "-O2 -Wall -pedantic -Wextra")
|
||||||
|
|
||||||
enable_testing()
|
enable_testing()
|
||||||
|
|
||||||
|
@@ -43,7 +43,7 @@ namespace YAML
|
|||||||
// Flow, // duplicate
|
// Flow, // duplicate
|
||||||
// Block, // duplicate
|
// Block, // duplicate
|
||||||
// Auto, // duplicate
|
// Auto, // duplicate
|
||||||
LongKey,
|
LongKey
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _Indent {
|
struct _Indent {
|
||||||
|
@@ -9,11 +9,11 @@ namespace YAML
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void Alias::Parse(Scanner *pScanner, const ParserState& state)
|
void Alias::Parse(Scanner */*pScanner*/, const ParserState& /*state*/)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void Alias::Write(std::ostream& out, int indent, bool startedLine, bool onlyOneCharOnLine)
|
void Alias::Write(std::ostream& out, int /*indent*/, bool /*startedLine*/, bool /*onlyOneCharOnLine*/)
|
||||||
{
|
{
|
||||||
out << "\n";
|
out << "\n";
|
||||||
}
|
}
|
||||||
|
@@ -63,7 +63,7 @@ namespace YAML
|
|||||||
ES_DONE_WITH_FLOW_MAP_KEY,
|
ES_DONE_WITH_FLOW_MAP_KEY,
|
||||||
ES_WAITING_FOR_FLOW_MAP_VALUE,
|
ES_WAITING_FOR_FLOW_MAP_VALUE,
|
||||||
ES_WRITING_FLOW_MAP_VALUE,
|
ES_WRITING_FLOW_MAP_VALUE,
|
||||||
ES_DONE_WITH_FLOW_MAP_VALUE,
|
ES_DONE_WITH_FLOW_MAP_VALUE
|
||||||
};
|
};
|
||||||
|
|
||||||
class EmitterState
|
class EmitterState
|
||||||
|
@@ -128,7 +128,7 @@ namespace YAML
|
|||||||
pScanner->pop();
|
pScanner->pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Node::ParseAnchor(Scanner *pScanner, const ParserState& state)
|
void Node::ParseAnchor(Scanner *pScanner, const ParserState& /*state*/)
|
||||||
{
|
{
|
||||||
Token& token = pScanner->peek();
|
Token& token = pScanner->peek();
|
||||||
if(m_anchor != "")
|
if(m_anchor != "")
|
||||||
@@ -139,7 +139,7 @@ namespace YAML
|
|||||||
pScanner->pop();
|
pScanner->pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Node::ParseAlias(Scanner *pScanner, const ParserState& state)
|
void Node::ParseAlias(Scanner *pScanner, const ParserState& /*state*/)
|
||||||
{
|
{
|
||||||
Token& token = pScanner->peek();
|
Token& token = pScanner->peek();
|
||||||
if(m_anchor != "")
|
if(m_anchor != "")
|
||||||
|
@@ -15,14 +15,14 @@ namespace YAML
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void Scalar::Parse(Scanner *pScanner, const ParserState& state)
|
void Scalar::Parse(Scanner *pScanner, const ParserState& /*state*/)
|
||||||
{
|
{
|
||||||
Token& token = pScanner->peek();
|
Token& token = pScanner->peek();
|
||||||
m_data = token.value;
|
m_data = token.value;
|
||||||
pScanner->pop();
|
pScanner->pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Scalar::Write(std::ostream& out, int indent, bool startedLine, bool onlyOneCharOnLine)
|
void Scalar::Write(std::ostream& out, int /*indent*/, bool /*startedLine*/, bool /*onlyOneCharOnLine*/)
|
||||||
{
|
{
|
||||||
out << "\"";
|
out << "\"";
|
||||||
for(unsigned i=0;i<m_data.size();i++) {
|
for(unsigned i=0;i<m_data.size();i++) {
|
||||||
|
@@ -25,7 +25,7 @@ namespace YAML
|
|||||||
TT_ANCHOR,
|
TT_ANCHOR,
|
||||||
TT_ALIAS,
|
TT_ALIAS,
|
||||||
TT_TAG,
|
TT_TAG,
|
||||||
TT_SCALAR,
|
TT_SCALAR
|
||||||
};
|
};
|
||||||
|
|
||||||
const std::string TokenNames[] = {
|
const std::string TokenNames[] = {
|
||||||
@@ -46,7 +46,7 @@ namespace YAML
|
|||||||
"ANCHOR",
|
"ANCHOR",
|
||||||
"ALIAS",
|
"ALIAS",
|
||||||
"TAG",
|
"TAG",
|
||||||
"SCALAR",
|
"SCALAR"
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Token {
|
struct Token {
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
#include "tests.h"
|
#include "tests.h"
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main()
|
||||||
{
|
{
|
||||||
#ifdef WINDOWS
|
#ifdef WINDOWS
|
||||||
_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);
|
_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);
|
||||||
|
Reference in New Issue
Block a user