Author: ilor
Date: Sat May 2 00:30:21 2009
New Revision: 35405
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35405&view=rev
Log:
fix some msvc warnings
Modified:
trunk/src/game_events.cpp
trunk/src/gui/widgets/window.hpp
trunk/src/multiplayer.cpp
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=35405&r1=35404&r2=35405&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Sat May 2 00:30:21 2009
@@ -532,7 +532,7 @@
} // end anonymous namespace (2)
-static bool events_init() { return game_events::resources->screen; }
+static bool events_init() { return game_events::resources->screen != 0; }
namespace {
Modified: trunk/src/gui/widgets/window.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/window.hpp?rev=35405&r1=35404&r2=35405&view=diff
==============================================================================
--- trunk/src/gui/widgets/window.hpp (original)
+++ trunk/src/gui/widgets/window.hpp Sat May 2 00:30:21 2009
@@ -59,7 +59,7 @@
, public cursor::setter
{
friend class tdebug_layout_graph;
- friend class twindow_implementation;
+ friend struct twindow_implementation;
// Wants to use layout().
friend class tmessage;
Modified: trunk/src/multiplayer.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer.cpp?rev=35405&r1=35404&r2=35405&view=diff
==============================================================================
--- trunk/src/multiplayer.cpp (original)
+++ trunk/src/multiplayer.cpp Sat May 2 00:30:21 2009
@@ -216,7 +216,7 @@
std::string password =
preferences::password();
bool fall_through =
(*error)["force_confirmation"] == "yes" ?
-
gui::dialog(disp,_("Confirm"),(*error)["message"],gui::OK_CANCEL).show() :
+
(gui::dialog(disp,_("Confirm"),(*error)["message"],gui::OK_CANCEL).show() != 0)
:
false;
const bool is_pw_request =
!((*error)["password_request"].empty()) && !(password.empty());
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
