Added more warnings and removed an unused class.

diff --git a/Makefile b/Makefile
index af8924883e78abaffed2a54fa63fe807d3eec21a..8cc509f2a381e6dae085fb6e5861d6e94d5a90ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PREFIX ?= /usr
 
-OPTS=-Wall -Wextra -ansi -pedantic-errors -Wconversion $(CXXFLAGS)
+OPTS=-Wall -Wextra -ansi -pedantic-errors -Wconversion -Wfloat-equal -Wredundant-decls -Wstrict-null-sentinel -Winit-self -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wsign-promo $(CXXFLAGS)
 DICTIONARY_PATH=$(PREFIX)/share/jmdict
 DICTIONARY_NAME="\"$(DICTIONARY_PATH)/database\""
 BINDIR=${DESTDIR}${PREFIX}/bin

diff --git a/jmdict.cpp b/jmdict.cpp
index 2d761100f77eccad2335aef12d0eefbc20aae707..5d6818311ce39b3d39648837cfc9ef99029aa802 100644 (file)
--- a/jmdict.cpp
+++ b/jmdict.cpp
@@ -51,10 +51,6 @@ namespace options {
     bool beginning = false;
     bool ci_search = false;
 
-    class invalid_option : public std::runtime_error {
-           invalid_option(const string& s) : std::runtime_error(s) {}
-    };
-
     void getFrom(int argc, char** argv) {
         int opt;
         while ((opt = getopt(argc, argv, "bfijJl:")) != -1)