[Widelands-cvs] SF.net SVN: widelands: [3182] trunk/src

[<si...@us...>]

Revision: 3182
          http://widelands.svn.sourceforge.net/widelands/?rev=3182&view=rev
Author:   sigra
Date:     2008-04-18 14:17:43 -0700 (Fri, 18 Apr 2008)

Log Message:
-----------
Fix some 64bit warnings that were missed in revision 3181. Reported by Jari Hautio - jaari.

Revision Links:
--------------
    http://widelands.svn.sourceforge.net/widelands/?rev=3181&view=rev

Modified Paths:
--------------
    trunk/src/immovable.cc
    trunk/src/widelands_map_buildingdata_data_packet.cc
    trunk/src/widelands_map_roaddata_data_packet.cc

Modified: trunk/src/immovable.cc
===================================================================
--- trunk/src/immovable.cc	2008-04-18 11:56:37 UTC (rev 3181)
+++ trunk/src/immovable.cc	2008-04-18 21:17:43 UTC (rev 3182)
@@ -893,7 +893,9 @@
 PlayerImmovable::~PlayerImmovable()
 {
 	if (m_workers.size())
-		log("Building::~Building: %u workers left!\n", m_workers.size());
+		log
+			("Building::~Building: %lu workers left!\n",
+			 static_cast<long unsigned int>(m_workers.size()));
 }
 
 /**

Modified: trunk/src/widelands_map_buildingdata_data_packet.cc
===================================================================
--- trunk/src/widelands_map_buildingdata_data_packet.cc	2008-04-18 11:56:37 UTC (rev 3181)
+++ trunk/src/widelands_map_buildingdata_data_packet.cc	2008-04-18 21:17:43 UTC (rev 3182)
@@ -104,9 +104,9 @@
 									*it = &ol->get<Map_Object>(leaver_serial);
 								} catch (_wexception const & e) {
 									throw wexception
-										("leave queue item #%u (%u): %s",
-										 it - leave_queue.begin(), leaver_serial,
-										 e.what());
+										("leave queue item #%lu (%u): %s",
+										 static_cast<long int>(it - leave_queue.begin()),
+										 leaver_serial, e.what());
 								}
 						else
 							*it = 0;

Modified: trunk/src/widelands_map_roaddata_data_packet.cc
===================================================================
--- trunk/src/widelands_map_roaddata_data_packet.cc	2008-04-18 11:56:37 UTC (rev 3181)
+++ trunk/src/widelands_map_roaddata_data_packet.cc	2008-04-18 21:17:43 UTC (rev 3182)
@@ -107,7 +107,10 @@
 						try {
 							p.append(egbase->map(), fr.Direction8());
 						} catch (_wexception const & e) {
-							throw wexception("step #%u: %s", nr_steps - i, e.what());
+							throw wexception
+								("step #%lu: %s",
+								 static_cast<long unsigned int>(nr_steps - i),
+								 e.what());
 						}
 					road.set_path(egbase, p);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.