From d7ffc0afb35402ad930447e1e470052152bd3cf2 Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Wed, 28 Sep 2005 17:30:53 +0000 Subject: Added -Werror to CXXFLAGS. Removed unnecessary ambigous inheritance. --- ChangeLog | 6 ++++++ src/Makefile.am | 2 +- src/gui/error.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb972ffb..bffb4a1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-09-28 Björn Steinbrink + + * src/Makefile.am: Added -Werror to the CXXFLAGS to catch warnings + easier. + * src/gui/error.h: Removed unnecessary ambigous inheritance. + 2005-09-26 Yohann Ferreira * src/gui/char_select.cpp, debian/control, debian/rules, diff --git a/src/Makefile.am b/src/Makefile.am index 925cd835..4506fde4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -183,6 +183,6 @@ INCLUDES = \ # the library search path. tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0` -tmw_CXXFLAGS = -Wall $(OPENGL_CFLAGS) $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS) +tmw_CXXFLAGS = -Wall -Werror $(OPENGL_CFLAGS) $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS) tmw_LDADD = $(LIBSDL_LIBS) -lguichan_sdl -lguichan $(OPENGL_LIBS) $(CURL_LIBS) tmw_TARGET = tmw diff --git a/src/gui/error.h b/src/gui/error.h index 5447fbdf..d85b9269 100644 --- a/src/gui/error.h +++ b/src/gui/error.h @@ -36,7 +36,7 @@ * * \ingroup Interface */ -class ErrorDialog : public OkDialog, public gcn::ActionListener { +class ErrorDialog : public OkDialog { public: /** * Constructor -- cgit v1.2.3-70-g09d2