Merge lp:~widelands-dev/widelands/bug-1782377-compiler-error into lp:widelands

[Klaus Halfmann]

Fix for Bug#1782377

Fix compiler error in src/logic/player.cc.

As of to many auto variables the compiler (an I) got confused
how to use a iterator for a two dimensional array.

I simmplified the code to make the compiler and the codecheck happy.

I had not time to check this, yet.

Gun: in this case the codecheck did not point to a real improvement, do we really need that one?

[Klaus Halfmann (klaus-halfmann)]

I did a quick test, saving is still OK.

That stats[ware_index] is actually an invariant and could be removed, too. Next time :-)

[GunChleoc (gunchleoc)]

Thanks for cleaning up after me. I'm on a virtual machine right now that's too slow for compiling.

Let's get this in ASAP so that we can continue working, then find a more elegant solution later - the problem with the current code might just have been some pointer/reference thing.

@bunnybot merge

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3684. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/405534068.
Appveyor build 3483. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1782377_compiler_error-3483.

=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2018-07-18 15:01:33 +0000
+++ src/logic/player.cc	2018-07-18 19:49:00 +0000
@@ -1482,11 +1482,12 @@
 	const auto write_stats = [&fw](
 	   const std::vector<std::vector<uint32_t>>& stats, const DescriptionIndex ware_index) {
 		std::ostringstream oss("");
-		if (!stats[ware_index].empty()) {
-			for (uint32_t i = 0; i < stats[ware_index].size() - 1; ++i) {
+		const int sizem = stats[ware_index].size() - 1;
+		if (sizem >= 0) {
+			for (int i = 0; i < sizem; ++i) {
 				oss << stats[ware_index][i] << "|";
 			}
-			oss << stats[ware_index][stats[ware_index].rbegin()];
+			oss << stats[ware_index][sizem];
 		}
 		fw.c_string(oss.str());
 	};