[Wesnoth-cvs-commits] wesnoth/src hotkeys.hpp unit.cpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/01/22 00:25:54

Modified files:
        src            : hotkeys.hpp unit.cpp 

Log message:
        silenced some compiler warnings

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.hpp.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.cpp.diff?tr1=1.117&tr2=1.118&r1=text&r2=text

Patches:
Index: wesnoth/src/hotkeys.hpp
diff -u wesnoth/src/hotkeys.hpp:1.53 wesnoth/src/hotkeys.hpp:1.54
--- wesnoth/src/hotkeys.hpp:1.53        Sun Oct 31 20:42:16 2004
+++ wesnoth/src/hotkeys.hpp     Sat Jan 22 00:25:54 2005
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.hpp,v 1.53 2004/10/31 20:42:16 gruikya Exp $ */
+/* $Id: hotkeys.hpp,v 1.54 2005/01/22 00:25:54 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -118,7 +118,9 @@
 //abstract base class for objects that implement the ability
 //to execute hotkey commands.
 class command_executor
-{
+{
+protected:
+       virtual ~command_executor() {}
 public:
 
        virtual void cycle_units() {}
Index: wesnoth/src/unit.cpp
diff -u wesnoth/src/unit.cpp:1.117 wesnoth/src/unit.cpp:1.118
--- wesnoth/src/unit.cpp:1.117  Fri Jan 21 23:34:48 2005
+++ wesnoth/src/unit.cpp        Sat Jan 22 00:25:54 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.cpp,v 1.117 2005/01/21 23:34:48 Sirp Exp $ */
+/* $Id: unit.cpp,v 1.118 2005/01/22 00:25:54 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -418,7 +418,7 @@
 }
 
 static bool is_terrain(std::string const &terrain, gamemap::TERRAIN type) {
-       return std::count(terrain.begin(), terrain.end(), 
static_cast<gamemap::TERRAIN>(type));
+       return std::count(terrain.begin(), terrain.end(), 
static_cast<gamemap::TERRAIN>(type)) != 0;
 }
 
 bool unit::invisible(const std::string& terrain, int lawful_bonus,