From c9445f94b30b4bd9c7a45e13177fcb9de77fbc26 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Tue, 8 Nov 2016 11:07:00 +0100
Subject: [PATCH] enable and fix additional warnings for alib2str
---
alib2str/makefile | 4 +++-
alib2str/src/tree/TreeFromStringParser.cpp | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/alib2str/makefile b/alib2str/makefile
index 38bca86b66..bf9f76e926 100644
--- a/alib2str/makefile
+++ b/alib2str/makefile
@@ -10,6 +10,8 @@ endef
export NEW_LINE
+CXX_FLAGS := -Wall -pedantic -Wextra -Werror -Wshadow -Wpointer-arith -Wcast-qual -Wdelete-non-virtual-dtor -Wredundant-decls
+
space := $(eval) $(eval)
LDFLAGS_DEBUG:=-rdynamic -shared
@@ -54,7 +56,7 @@ FORCE:
$${NEW_LINE}\
export NEW_LINE$${NEW_LINE}\
$${NEW_LINE}\
- CXXFLAGS:= -pipe -std=c++11 \$$(CXX_OTHER_FLAGS) -c -Wall -pedantic -Wextra -Werror -fPIC \$$(addprefix -I, \$$(realpath $(INCLUDE_PATHS))) -I\$$(realpath \$$(SOURCES_BASE_DIR)/../src/)$${NEW_LINE}\
+ CXXFLAGS:= -pipe -std=c++11 \$$(CXX_OTHER_FLAGS) -c $(CXX_FLAGS) -fPIC \$$(addprefix -I, \$$(realpath $(INCLUDE_PATHS))) -I\$$(realpath \$$(SOURCES_BASE_DIR)/../src/)$${NEW_LINE}\
$${NEW_LINE}\
SOURCES:= \$$(shell find \$$(SOURCES_BASE_DIR)/\$$(SRCDIR) -maxdepth 1 -type f -name \"*.cpp\")$${NEW_LINE}\
DEPENDENCIES:= \$$(patsubst \$$(SOURCES_BASE_DIR)/\$$(SRCDIR)%.cpp, \$$(OBJECTS_BASE_DIR)/\$$(SRCDIR)%.d, \$$(SOURCES))$${NEW_LINE}\
diff --git a/alib2str/src/tree/TreeFromStringParser.cpp b/alib2str/src/tree/TreeFromStringParser.cpp
index 6c41ea489c..6c57da18cd 100644
--- a/alib2str/src/tree/TreeFromStringParser.cpp
+++ b/alib2str/src/tree/TreeFromStringParser.cpp
@@ -134,7 +134,7 @@ std::tree < std::ranked_symbol < > > TreeFromStringParser::parseRankedContent (
unsigned rank = 0;
std::vector < std::tree < std::ranked_symbol < > > > childs;
- TreeFromStringLexer::Token token = TreeFromStringLexer::next ( input );
+ token = TreeFromStringLexer::next ( input );
if ( token.type == TreeFromStringLexer::TokenType::RANK )
rank = std::from_string < unsigned > ( token.value );
@@ -176,7 +176,7 @@ std::tree < alphabet::Symbol > TreeFromStringParser::parseUnrankedContent ( std:
std::vector < std::tree < alphabet::Symbol > > childs;
- TreeFromStringLexer::Token token = TreeFromStringLexer::next ( input );
+ token = TreeFromStringLexer::next ( input );
while ( token.type != TreeFromStringLexer::TokenType::BAR ) {
TreeFromStringLexer::putback ( input, token );
--
GitLab