widelands-dev team mailing list archive

[Andreas Breitschopp <a-breitschopp@xxxxxxxxxxx>]

Andreas Breitschopp has proposed merging lp:~ab-tools/widelands/msvs2010-compileerrors into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~ab-tools/widelands/msvs2010-compileerrors/+merge/109357

Fixing MSVS 2010 compile errors as discussed here:
http://wl.widelands.org/forum/topic/1064/?page=1#post-8178
-- 
https://code.launchpad.net/~ab-tools/widelands/msvs2010-compileerrors/+merge/109357
Your team Widelands Developers is requested to review the proposed merge of lp:~ab-tools/widelands/msvs2010-compileerrors into lp:widelands.

=== modified file 'src/io/filesystem/filesystem.cc'
--- src/io/filesystem/filesystem.cc	2012-03-04 22:49:05 +0000
+++ src/io/filesystem/filesystem.cc	2012-06-08 13:07:23 +0000
@@ -40,6 +40,7 @@
 #include <string>
 #include <vector>
 #include <list>
+#include <iterator>
 
 #ifdef WIN32
 #include "log.h"

=== modified file 'src/logic/world.cc'
--- src/logic/world.cc	2012-02-15 21:25:34 +0000
+++ src/logic/world.cc	2012-06-08 13:07:23 +0000
@@ -813,7 +813,6 @@
 
 ==============================================================================
 */
-
 Terrain_Descr::Terrain_Descr
 	(char                       const * const directory,
 	 Section                          * const s,
@@ -860,11 +859,12 @@
 		uint32_t i = 0;
 		int32_t cur_res = 0;
 		while (i <= str1.size()) {
-			if (str1[i] == ' ' || str1[i] == ' ' || str1[i] == '\t') {
+			if (i != str1.size() &&
+					(str1[i] == ' ' || str1[i] == ' ' || str1[i] == '\t')) {
 				++i;
 				continue;
 			}
-			if (str1[i] == ',' || i == str1.size()) {
+			if (i == str1.size() || str1[i] == ',') {
 				const int32_t res = resources->get_index(curres.c_str());;
 				if (res == -1)
 					throw game_data_error

=== modified file 'src/wui/overlay_manager.cc'
--- src/wui/overlay_manager.cc	2012-02-15 21:25:34 +0000
+++ src/wui/overlay_manager.cc	2012-06-08 13:07:23 +0000
@@ -202,8 +202,7 @@
 		if (jt->first == it->first) {
 			// There are several overlays registered for this location.
 			if (jt->second.level < it->second.level) {
-				std::swap<Overlay_Manager::Registered_Overlays>
-					(it->second, jt->second);
+				std::swap(it->second, jt->second);
 				it = overlay_map.lower_bound(c);
 			} else ++it;
 		} else break; // it is the last element, break this loop.