Merge lp:~widelands-dev/widelands/ai_handler_includes into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 8703
Proposed branch: lp:~widelands-dev/widelands/ai_handler_includes
Merge into: lp:widelands
Diff against target: 54 lines (+6/-12)
3 files modified
src/logic/CMakeLists.txt (+1/-0)
src/logic/ai_dna_handler.cc (+4/-7)
src/logic/ai_dna_handler.h (+1/-5)
To merge this branch: bzr merge lp:~widelands-dev/widelands/ai_handler_includes
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+345456@code.launchpad.net

Commit message

Cleanup includes for AiDnaHandler

Description of the change

Just a small cleanup to include the stuff that's actually being used ;)

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3501. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/378040707.
Appveyor build 3306. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_handler_includes-3306.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/CMakeLists.txt'
2--- src/logic/CMakeLists.txt 2017-12-19 07:12:18 +0000
3+++ src/logic/CMakeLists.txt 2018-05-12 07:57:08 +0000
4@@ -291,6 +291,7 @@
5 network
6 note_sound
7 notifications
8+ profile
9 random
10 scripting_coroutine
11 scripting_logic
12
13=== modified file 'src/logic/ai_dna_handler.cc'
14--- src/logic/ai_dna_handler.cc 2018-04-07 16:59:00 +0000
15+++ src/logic/ai_dna_handler.cc 2018-05-12 07:57:08 +0000
16@@ -20,15 +20,12 @@
17 #include "logic/ai_dna_handler.h"
18
19 #include <cstring>
20-#include <memory>
21-
22-#include <boost/algorithm/string.hpp>
23-#include <boost/format.hpp>
24-
25-#include "base/macros.h"
26+
27+#include "base/time_string.h"
28 #include "base/wexception.h"
29+#include "io/filesystem/layered_filesystem.h"
30 #include "logic/filesystem_constants.h"
31-#include "wui/interactive_base.h"
32+#include "profile/profile.h"
33
34 namespace Widelands {
35
36
37=== modified file 'src/logic/ai_dna_handler.h'
38--- src/logic/ai_dna_handler.h 2018-04-07 16:59:00 +0000
39+++ src/logic/ai_dna_handler.h 2018-05-12 07:57:08 +0000
40@@ -20,13 +20,9 @@
41 #ifndef WL_LOGIC_AI_DNA_HANDLER_H
42 #define WL_LOGIC_AI_DNA_HANDLER_H
43
44-#include <cstring>
45-#include <string>
46-
47+#include <vector>
48 #include <stdint.h>
49
50-#include "base/time_string.h"
51-#include "logic/game.h"
52 #include "logic/player.h"
53
54 namespace Widelands {

Subscribers

People subscribed via source and target branches

to status/vote changes: