Merge lp:~qcumber-some/widelands/bug1197429 into lp:widelands

Proposed by Jens Beyer on 2013-07-03
Status: Merged
Merged at revision: 6594
Proposed branch: lp:~qcumber-some/widelands/bug1197429
Merge into: lp:widelands
Diff against target: 11 lines (+1/-0)
1 file modified
src/logic/ship.h (+1/-0)
To merge this branch: bzr merge lp:~qcumber-some/widelands/bug1197429
Reviewer Review Type Date Requested Status
Nasenbaer Approve on 2013-07-03
Tino 2013-07-03 Needs Fixing on 2013-07-03
Review via email:

Description of the change

Seems to be a visibility problem (and an easy fix).

But as with all C++ stuff, I'll let others decide if this really works as intended. ;-)

To post a comment you must log in.
Tino (tino79) wrote :

Confirming successful build on win32.
But was the debugging option for gcc in the CMakeList.txt intended for the commit?

review: Needs Fixing
6594. By Jens Beyer on 2013-07-03

Fix apparently a visibility problem with std::list

Jens Beyer (qcumber-some) wrote :

oops... no, this was not intended. ;-) I pushed the branch again...

Nasenbaer (nasenbaer) wrote :

I had the same question as Tino, but now that it is fixed... definitely approved!

review: Approve
SirVer (sirver) wrote :

C++ includes should be before any " " includes. Otherwise lgtm

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/ship.h'
2--- src/logic/ship.h 2013-06-30 18:18:47 +0000
3+++ src/logic/ship.h 2013-07-03 16:53:45 +0000
4@@ -23,6 +23,7 @@
5 #include "bob.h"
6 #include "economy/shippingitem.h"
7 #include "graphic/diranimations.h"
8+#include <list>
10 namespace UI {class Window;}
11 class Interactive_GameBase;


People subscribed via source and target branches

to status/vote changes: