Merge lp:~widelands-dev/widelands/bug-1699852-compiler-warning into lp:widelands

[GunChleoc]

Fix [-Wundefined-func-template] compiler warnings.

All this one needed in the end was declaring the template variants from the .cc files in the .h files.

[Klaus Halfmann (klaus-halfmann)]

Thanks for fixing this one, syntax and usage of templates in C++ still give me a headache.

I will try to review it,but I am running out of time for this weekend.

[GunChleoc (gunchleoc)]

No worries - thanks for all the reviews you're doing!

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4078. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/435186354.
Appveyor build 3874. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1699852_compiler_warning-3874.

[Klaus Halfmann (klaus-halfmann)]

I still get these:

.../src/logic/map_objects/tribes/ship.cc:705:3: warning: fallthrough annotation in
      unreachable code [-Wimplicit-fallthrough]
                FALLS_THROUGH;

../src/ui_basic/fileview_panel.h:50:23: warning: non-static data member 'style_' of
      'FileViewPanel' shadows member inherited from type 'TabPanel' [-Wshadow-field]
        const UI::PanelStyle style_;

../src/wui/watchwindow.h:41:2: warning: '~WatchWindow' overrides a destructor but is not
      marked 'override' [-Winconsistent-missing-destructor-override]
        ~WatchWindow();

../src/wui/seafaring_statistics_menu.cc:422:3: note: insert 'break;' to avoid
      fall-through
                default:

../src/wui/game_client_disconnected.h:29:1: warning: class 'GameHost' was previously
      declared as a struct [-Wmismatched-tags]
class GameHost;

../src/wui/waresdisplay.cc:388:13: warning: no previous extern declaration for
      non-static variable 'unit_suffixes' [-Wmissing-variable-declarations]
const char* unit_suffixes[] = {

Those switch warnigns are difficult, the rest should be easy....
... or shall we address them in a later branch?

[GunChleoc (gunchleoc)]

Those are already fixed in https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_200809/+merge/355875 - also waiting for review ;)

[Klaus Halfmann (klaus-halfmann)]

No real changes, so I wont do any further tests.

@bunnybot merge

review: Approve (review, compile)

=== modified file 'src/logic/mapfringeregion.h'
--- src/logic/mapfringeregion.h	2018-04-07 16:59:00 +0000
+++ src/logic/mapfringeregion.h	2018-09-30 06:27:41 +0000
@@ -77,6 +77,10 @@
 	typename AreaType::RadiusType remaining_in_phase_;
 	uint8_t phase_;
 };
+
+// Forward declarations of template instantiations
+template <> bool MapFringeRegion<Area<FCoords>>::advance(const Map& map);
+template <> bool MapFringeRegion<Area<>>::advance(const Map& map);
 }
 
 #endif  // end of include guard: WL_LOGIC_MAPFRINGEREGION_H

=== modified file 'src/logic/maphollowregion.h'
--- src/logic/maphollowregion.h	2018-04-07 16:59:00 +0000
+++ src/logic/maphollowregion.h	2018-09-30 06:27:41 +0000
@@ -72,6 +72,10 @@
 	uint32_t rowpos_;                     // # of fields we have returned in this row
 	typename AreaType::CoordsType left_;  //  left-most node of current row
 };
+
+// Forward declarations of template instantiations
+template<> MapHollowRegion<Area<>>::MapHollowRegion(const Map& map, const HollowArea<Area<>>& hollow_area);
+template <> bool MapHollowRegion<Area<>>::advance(const Map& map);
 }
 
 #endif  // end of include guard: WL_LOGIC_MAPHOLLOWREGION_H

=== modified file 'src/logic/maptriangleregion.h'
--- src/logic/maptriangleregion.h	2018-04-07 16:59:00 +0000
+++ src/logic/maptriangleregion.h	2018-09-30 06:27:41 +0000
@@ -121,6 +121,13 @@
 	CoordsType left_;
 	TCoords<CoordsType> location_;
 };
+
+// Forward declarations of template instantiations
+template<> MapTriangleRegion<>::MapTriangleRegion(const Map& map, Area<TCoords<>> area);
+template<> bool MapTriangleRegion<>::advance(const Map& map);
+
+template<> MapTriangleRegion<TCoords<FCoords>>::MapTriangleRegion(const Map& map, Area<TCoords<FCoords>> area);
+template<> bool MapTriangleRegion<TCoords<FCoords>>::advance(const Map& map);
 }
 
 #endif  // end of include guard: WL_LOGIC_MAPTRIANGLEREGION_H