From 616eafc3c13bd623e5059b71210729d8c81c4cc7 Mon Sep 17 00:00:00 2001
From: jbeder <jbeder@localhost>
Date: Fri, 10 Jul 2009 03:30:04 +0000
Subject: [PATCH] Fixed warnings to compile on gcc with -Wall -pedantic -Wextra

---
 CMakeLists.txt         | 2 +-
 include/emittermanip.h | 2 +-
 src/alias.cpp          | 4 ++--
 src/emitterstate.h     | 2 +-
 src/node.cpp           | 4 ++--
 src/scalar.cpp         | 4 ++--
 src/token.h            | 4 ++--
 yaml-reader/main.cpp   | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b1856f..4c209f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 
 project (YAML_CPP)
 
-SET(CMAKE_CXX_FLAGS "-O2")
+SET(CMAKE_CXX_FLAGS "-O2 -Wall -pedantic -Wextra")
 
 enable_testing()
 
diff --git a/include/emittermanip.h b/include/emittermanip.h
index 05a9e64..22e5fd3 100644
--- a/include/emittermanip.h
+++ b/include/emittermanip.h
@@ -43,7 +43,7 @@ namespace YAML
 		// Flow, // duplicate
 		// Block, // duplicate
 		// Auto, // duplicate
-		LongKey,
+		LongKey
 	};
 	
 	struct _Indent {
diff --git a/src/alias.cpp b/src/alias.cpp
index ae349cf..f6c43af 100644
--- a/src/alias.cpp
+++ b/src/alias.cpp
@@ -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";
 	}
diff --git a/src/emitterstate.h b/src/emitterstate.h
index 763047e..1edfa54 100644
--- a/src/emitterstate.h
+++ b/src/emitterstate.h
@@ -63,7 +63,7 @@ namespace YAML
 		ES_DONE_WITH_FLOW_MAP_KEY,
 		ES_WAITING_FOR_FLOW_MAP_VALUE,
 		ES_WRITING_FLOW_MAP_VALUE,
-		ES_DONE_WITH_FLOW_MAP_VALUE,
+		ES_DONE_WITH_FLOW_MAP_VALUE
 	};
 	
 	class EmitterState
diff --git a/src/node.cpp b/src/node.cpp
index b70b4e9..34b303c 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -128,7 +128,7 @@ namespace YAML
 		pScanner->pop();
 	}
 	
-	void Node::ParseAnchor(Scanner *pScanner, const ParserState& state)
+	void Node::ParseAnchor(Scanner *pScanner, const ParserState& /*state*/)
 	{
 		Token& token = pScanner->peek();
 		if(m_anchor != "")
@@ -139,7 +139,7 @@ namespace YAML
 		pScanner->pop();
 	}
 
-	void Node::ParseAlias(Scanner *pScanner, const ParserState& state)
+	void Node::ParseAlias(Scanner *pScanner, const ParserState& /*state*/)
 	{
 		Token& token = pScanner->peek();
 		if(m_anchor != "")
diff --git a/src/scalar.cpp b/src/scalar.cpp
index 34e8280..5576f23 100644
--- a/src/scalar.cpp
+++ b/src/scalar.cpp
@@ -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();
 		m_data = token.value;
 		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 << "\"";
 		for(unsigned i=0;i<m_data.size();i++) {
diff --git a/src/token.h b/src/token.h
index 5b000d1..8aec243 100644
--- a/src/token.h
+++ b/src/token.h
@@ -25,7 +25,7 @@ namespace YAML
 		TT_ANCHOR,
 		TT_ALIAS,
 		TT_TAG,
-		TT_SCALAR,
+		TT_SCALAR
 	};
 
 	const std::string TokenNames[] = {
@@ -46,7 +46,7 @@ namespace YAML
 		"ANCHOR",
 		"ALIAS",
 		"TAG",
-		"SCALAR",
+		"SCALAR"
 	};
 
 	struct Token {
diff --git a/yaml-reader/main.cpp b/yaml-reader/main.cpp
index d047b3f..881bc57 100644
--- a/yaml-reader/main.cpp
+++ b/yaml-reader/main.cpp
@@ -1,6 +1,6 @@
 #include "tests.h"
 
-int main(int argc, char **argv)
+int main()
 {
 #ifdef WINDOWS
 	_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);