Merge lp:~ab-tools/widelands/msvs2010-compileerrors into lp:widelands

[Andreas Breitschopp]

Fixing MSVS 2010 compile errors as discussed here:
http://wl.widelands.org/forum/topic/1064/?page=1#post-8178

[SirVer (sirver)]

Some of these fixes are quite strange, but they compile on my system, so I went ahead and merged them. Thanks Andreas!

[Peter Waller (peter.waller)]

This merge introduces the following codecheck failures:

src/logic/world.cc:862: Multiline conditional should break after conditional. if (a) blah... -> if (a) \n blah
src/logic/world.cc:862: Parenthesis not closed before end of line must be at line begin
src/logic/world.cc:863: Found '{', but only closing tokens are allowed after closing parenthesis with corresponding opening parenthesis on an earlier line

[Andreas Breitschopp (ab-tools)]

Hello Holger,

you're welcome, thanks for merging!

I guess especially the change regarding "std::swap" looks strange - if somebody is interested why, here is the explanation from Microsoft why "<Overlay_Manager::Registered_Overlays>" is not necessary and also not allowed anymore with the VS 2010 compiler version:
http://connect.microsoft.com/VisualStudio/feedback/details/499152/valid-c-program-using-std-swap-fails-to-compile-in-vc10

Best regards
Andreas

[Andreas Breitschopp (ab-tools)]

Hello Peter,

I'll look at that today evening why it conplains about the code style at this position.

Best regards
Andreas

=== 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.