* [devel] I: boost 1.48.0
@ 2011-12-02 6:36 Ivan A. Melnikov
2011-12-02 9:29 ` Ivan A. Melnikov
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Ivan A. Melnikov @ 2011-12-02 6:36 UTC (permalink / raw)
To: ALT Linux Team development discussions
Здравствуйте.
В Сизиф собран очередной свежий boost, на этот раз 1.48.0.
Из замеченых проблем: разламывается сборка некоторых программ,
использующих move emulation от adobe (adobe/move.hpp). Исправления для
gigi на этот случай у меня в git:
http://git.altlinux.org/people/iv/packages/?p=gigi.git;a=commit;h=4ff3b88f7468a1244e4f23cdd60dba60a3d909fb
Если всплывёт ещё что, обращайтесь, правда на выходных могу оказаться
не доступен.
Также прошу сообщество по мере возможности пересобрать зависящие от
boost 1.47.0 пакеты, чтобы можно было удалить традиционный
compat-пакет boost1_47_0.
--
WBR,
Ivan A. Melnikov
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-02 6:36 [devel] I: boost 1.48.0 Ivan A. Melnikov
@ 2011-12-02 9:29 ` Ivan A. Melnikov
2011-12-02 14:00 ` Vitaly Kuznetsov
` (2 more replies)
2011-12-02 15:10 ` Ivan A. Melnikov
2 siblings, 3 replies; 14+ messages in thread
From: Ivan A. Melnikov @ 2011-12-02 9:29 UTC (permalink / raw)
To: devel
On Fri, 2 Dec 2011 10:36:37 +0400
"Ivan A. Melnikov" <iv@altlinux.org> wrote:
[...]
>
> Также прошу сообщество по мере возможности пересобрать зависящие от
> boost 1.47.0 пакеты, чтобы можно было удалить традиционный
> compat-пакет boost1_47_0.
>
По совету mike@ (спасибо), список таких пакетов с ACL:
0ad @nobody
CoinOBOE real @everybody
PokerTH sem @everybody
akonadi zerg
aqsis viy @everybody
asc oddity @qa
avogadro zerg @everybody
bastet viy @everybody
bitcoin vvk @everybody
bombono-dvd dubrsl @qa @python
cgal real @everybody
dakota real @everybody
dealii-complex real @everybody
dealii-real real @everybody
ditchers george @everybody
dolfin-complex real sin @python @qa @everybody
dolfin-real real sin @python @qa @everybody
ember viy @everybody
fastcgi++ vostok @everybody
fatrat drool @qa iv
flush drool @everybody
free-cad real @everybody
freeorion dubrsl @qa @python
frogatto force @everybody
fuse-encfs mithraen @everybody
gearmand rt @everybody
gigi dubrsl @qa
glob2 oddity @qa
gnash @nobody
hugin boyarsh @qa
kcollectd naf @everybody
kde4edu zerg
krb5user sin @qa
libeo george @everybody
libpion-net drool @everybody iv
libtorrent-rasterbar0.15 swi
licq zerg @everybody
lyx swi @qa karpov
mkvtoolnix sbolshakov
mongo vitty @everybody mithraen
mp3diags force @qa @everybody
ogre dubrsl @qa
pdfcube @nobody
pentobi george @everybody
pingus oddity @qa
plee-the-bear viy @everybody
python-module-IceSSL sin @qa
python-module-boostmpi real @everybody
python-module-kadmin5 sin @qa
python-module-meshpy real @everybody
python-module-pyexiv2 force george @qa @python
python-module-pymetis real @everybody
python-module-pyublas real @everybody
python-module-pyublasext real @everybody
python-module-tagpy swi @python @qa
qbittorrent swi
qutecom gray_graff @qa
schroot sin @everybody
smc vitty
source-highlight vvk @everybody
springlobby viy @everybody
springrts redbaron @everybody
swift amike @everybody
twinkle lav sbolshakov @qa
vegastrike viy @everybody
violetland george @everybody
vtk real sin @python @qa @everybody
wesnoth vitty
xscript real @everybody
zarafa radik rider snejok @qa
--
WBR,
Ivan A. Melnikov
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-02 9:29 ` Ivan A. Melnikov
@ 2011-12-02 14:00 ` Vitaly Kuznetsov
2011-12-02 15:11 ` Ivan A. Melnikov
2011-12-04 15:43 ` Motsyo Gennadi aka Drool
2011-12-05 6:06 ` REAL
2 siblings, 1 reply; 14+ messages in thread
From: Vitaly Kuznetsov @ 2011-12-02 14:00 UTC (permalink / raw)
To: devel
On Fri, 2 Dec 2011 13:29:44 +0400, Ivan A. Melnikov wrote:
> wesnoth vitty
Перестал собираться со следующей диагностикой
foreach.hpp:6:17: error: 'boost::BOOST_FOREACH' has not been declared
http://git.altlinux.org/beehive/logs/Sisyphus-i586/latest/error/wesnoth-1.8.6-alt2.1
Подсказывайте, как чинить :)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-02 6:36 [devel] I: boost 1.48.0 Ivan A. Melnikov
2011-12-02 9:29 ` Ivan A. Melnikov
@ 2011-12-02 15:10 ` Ivan A. Melnikov
2011-12-02 15:16 ` Sergey V Turchin
2 siblings, 1 reply; 14+ messages in thread
From: Ivan A. Melnikov @ 2011-12-02 15:10 UTC (permalink / raw)
To: devel
On Fri, 2 Dec 2011 10:36:37 +0400
"Ivan A. Melnikov" <iv@altlinux.org> wrote:
> Здравствуйте.
>
> В Сизиф собран очередной свежий boost, на этот раз 1.48.0.
>
> Из замеченых проблем:
Ещё у нас теперь воспроизводится
https://bugreports.qt.nokia.com/browse/QTBUG-22829
(по результатам пересборки пострадало 5 пакетов).
Я думаю сделать для этого workaround в самом boost, но успею не раньше
понедельника, и не уверен, что получится.
--
WBR,
Ivan A. Melnikov
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-02 14:00 ` Vitaly Kuznetsov
@ 2011-12-02 15:11 ` Ivan A. Melnikov
0 siblings, 0 replies; 14+ messages in thread
From: Ivan A. Melnikov @ 2011-12-02 15:11 UTC (permalink / raw)
To: devel
[-- Attachment #1: Type: text/plain, Size: 1082 bytes --]
On Fri, 02 Dec 2011 18:00:40 +0400
Vitaly Kuznetsov <vitty@altlinux.ru> wrote:
> On Fri, 2 Dec 2011 13:29:44 +0400, Ivan A. Melnikov wrote:
> > wesnoth vitty
>
> Перестал собираться со следующей диагностикой
>
> foreach.hpp:6:17: error: 'boost::BOOST_FOREACH' has not been declared
>
> http://git.altlinux.org/beehive/logs/Sisyphus-i586/latest/error/wesnoth-1.8.6-alt2.1
>
> Подсказывайте, как чинить :)
Макрос foreach из src/foreach.hpp раскрылся не там, где нужно. Сделайте
строку
#include "foreach.hpp"
последней из #include'ов везде, где это вылезет.
В общем, тот самый легендарный рак, который вызывается избытками
синтаксического сахара.
Патч в аттаче -- как первый вариант исправления. Полностью поверить его
уже не успеваю.
--
WBR,
Ivan A. Melnikov
[-- Attachment #2: wesnoth-1.8.6-hate-foreach.patch --]
[-- Type: text/x-patch, Size: 77420 bytes --]
diff --git a/wesnoth/src/about.cpp b/wesnoth/src/about.cpp
index 7bc0036..a74eb09 100644
--- a/wesnoth/src/about.cpp
+++ b/wesnoth/src/about.cpp
@@ -22,12 +22,12 @@
#include "construct_dialog.hpp"
#include "display.hpp"
#include "font.hpp"
-#include "foreach.hpp"
#include "game_config.hpp"
#include "gettext.hpp"
#include "marked-up_text.hpp"
#include "video.hpp"
#include "show_dialog.hpp"
+#include "foreach.hpp"
/**
* @namespace about
diff --git a/wesnoth/src/actions.cpp b/wesnoth/src/actions.cpp
index fa3c425..beab594 100644
--- a/wesnoth/src/actions.cpp
+++ b/wesnoth/src/actions.cpp
@@ -18,7 +18,6 @@
*/
#include "attack_prediction.hpp"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "game_end_exceptions.hpp"
#include "game_events.hpp"
@@ -43,6 +42,7 @@
#include <boost/bind.hpp>
#include <boost/scoped_ptr.hpp>
#include <list>
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
diff --git a/wesnoth/src/addon_management.cpp b/wesnoth/src/addon_management.cpp
index a5015bb..be5a44c 100644
--- a/wesnoth/src/addon_management.cpp
+++ b/wesnoth/src/addon_management.cpp
@@ -18,7 +18,6 @@
#include "addon_management.hpp"
#include "dialogs.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "formatter.hpp"
#include "game_display.hpp"
#include "game_preferences.hpp"
@@ -35,6 +34,7 @@
#include "version.hpp"
#include "wml_separators.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_CFG LOG_STREAM(err , log_config)
diff --git a/wesnoth/src/ai/composite/ai.cpp b/wesnoth/src/ai/composite/ai.cpp
index fd6754f..e2f509f 100644
--- a/wesnoth/src/ai/composite/ai.cpp
+++ b/wesnoth/src/ai/composite/ai.cpp
@@ -21,11 +21,11 @@
#include "ai.hpp"
#include "stage.hpp"
#include "../manager.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
#include <boost/bind.hpp>
#include <boost/function.hpp>
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/composite/aspect.hpp b/wesnoth/src/ai/composite/aspect.hpp
index 89c2fa3..6099b91 100644
--- a/wesnoth/src/ai/composite/aspect.hpp
+++ b/wesnoth/src/ai/composite/aspect.hpp
@@ -30,7 +30,6 @@
#include "../default/contexts.hpp"
#include "../game_info.hpp"
#include "../manager.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
#include "../../terrain_filter.hpp"
@@ -43,6 +42,7 @@
#include <boost/bind.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/pointer_cast.hpp>
+#include "../../foreach.hpp"
#ifdef _MSC_VER
#pragma warning(push)
diff --git a/wesnoth/src/ai/composite/component.cpp b/wesnoth/src/ai/composite/component.cpp
index 440fc16..57770f0 100644
--- a/wesnoth/src/ai/composite/component.cpp
+++ b/wesnoth/src/ai/composite/component.cpp
@@ -20,12 +20,12 @@
#include "component.hpp"
#include "engine.hpp"
#include "../../log.hpp"
-#include "../../foreach.hpp"
#include "../formula/ai.hpp"
#include <boost/lexical_cast.hpp>
#include <boost/regex.hpp>
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/composite/engine.cpp b/wesnoth/src/ai/composite/engine.cpp
index db38c90..e4c7f39 100644
--- a/wesnoth/src/ai/composite/engine.cpp
+++ b/wesnoth/src/ai/composite/engine.cpp
@@ -20,8 +20,8 @@
#include "engine.hpp"
#include "contexts.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/composite/engine_default.cpp b/wesnoth/src/ai/composite/engine_default.cpp
index b86037a..3ec5d60 100644
--- a/wesnoth/src/ai/composite/engine_default.cpp
+++ b/wesnoth/src/ai/composite/engine_default.cpp
@@ -20,8 +20,8 @@
#include "ai.hpp"
#include "engine_default.hpp"
#include "rca.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/composite/engine_fai.cpp b/wesnoth/src/ai/composite/engine_fai.cpp
index 5149d87..54078e1 100644
--- a/wesnoth/src/ai/composite/engine_fai.cpp
+++ b/wesnoth/src/ai/composite/engine_fai.cpp
@@ -23,8 +23,8 @@
#include "../formula/stage_side_formulas.hpp"
#include "../formula/stage_unit_formulas.hpp"
#include "rca.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/composite/rca.cpp b/wesnoth/src/ai/composite/rca.cpp
index b50db33..56570b6 100644
--- a/wesnoth/src/ai/composite/rca.cpp
+++ b/wesnoth/src/ai/composite/rca.cpp
@@ -20,8 +20,8 @@
#include "ai.hpp"
#include "engine.hpp"
#include "rca.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/composite/stage.cpp b/wesnoth/src/ai/composite/stage.cpp
index 1b298cb..d20a7ab 100644
--- a/wesnoth/src/ai/composite/stage.cpp
+++ b/wesnoth/src/ai/composite/stage.cpp
@@ -20,11 +20,11 @@
#include "ai.hpp"
#include "stage.hpp"
#include "../contexts.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
#include "../../tod_manager.hpp"
#include <map>
#include <string>
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/configuration.cpp b/wesnoth/src/ai/configuration.cpp
index a90a108..6c93774 100644
--- a/wesnoth/src/ai/configuration.cpp
+++ b/wesnoth/src/ai/configuration.cpp
@@ -21,7 +21,6 @@
#include "configuration.hpp"
#include "../filesystem.hpp"
-#include "../foreach.hpp"
#include "../log.hpp"
#include "../serialization/parser.hpp"
#include "../serialization/preprocessor.hpp"
@@ -29,6 +28,7 @@
#include <boost/lexical_cast.hpp>
#include <vector>
+#include "../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/default/ai.cpp b/wesnoth/src/ai/default/ai.cpp
index fda71af..9bd1ece 100644
--- a/wesnoth/src/ai/default/ai.cpp
+++ b/wesnoth/src/ai/default/ai.cpp
@@ -25,7 +25,6 @@
#include "../../array.hpp"
#include "../../dialogs.hpp"
-#include "../../foreach.hpp"
#include "../../game_end_exceptions.hpp"
#include "../../game_events.hpp"
#include "../../game_preferences.hpp"
@@ -37,6 +36,7 @@
#include "../../unit_display.hpp"
#include "../../wml_exception.hpp"
+#include "../../foreach.hpp"
#include <iterator>
#include <algorithm>
#include <fstream>
diff --git a/wesnoth/src/ai/default/attack.cpp b/wesnoth/src/ai/default/attack.cpp
index 973e44f..a70d9ed 100644
--- a/wesnoth/src/ai/default/attack.cpp
+++ b/wesnoth/src/ai/default/attack.cpp
@@ -24,9 +24,9 @@
#include "../manager.hpp"
#include "../../attack_prediction.hpp"
-#include "foreach.hpp"
#include "../../map.hpp"
#include "../../log.hpp"
+#include "foreach.hpp"
static lg::log_domain log_ai("ai/attack");
#define LOG_AI LOG_STREAM(info, log_ai)
diff --git a/wesnoth/src/ai/default/contexts.cpp b/wesnoth/src/ai/default/contexts.cpp
index 4578c99..0a65bff 100644
--- a/wesnoth/src/ai/default/contexts.cpp
+++ b/wesnoth/src/ai/default/contexts.cpp
@@ -21,10 +21,10 @@
#include "contexts.hpp"
#include "../../attack_prediction.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
#include "../../map.hpp"
#include "../composite/goal.hpp"
+#include "../../foreach.hpp"
static lg::log_domain log_ai("ai/general");
#define DBG_AI LOG_STREAM(debug, log_ai)
diff --git a/wesnoth/src/ai/default/move.cpp b/wesnoth/src/ai/default/move.cpp
index 1b2116e..b3a6c04 100644
--- a/wesnoth/src/ai/default/move.cpp
+++ b/wesnoth/src/ai/default/move.cpp
@@ -23,12 +23,12 @@
#include "ai.hpp"
#include "../composite/goal.hpp"
-#include "../../foreach.hpp"
#include "../../gettext.hpp"
#include "../../log.hpp"
#include "../../map.hpp"
#include "../../terrain_filter.hpp"
#include "../../wml_exception.hpp"
+#include "../../foreach.hpp"
static lg::log_domain log_ai("ai/move");
diff --git a/wesnoth/src/ai/formula/ai.cpp b/wesnoth/src/ai/formula/ai.cpp
index fcecf2e..b15c8e8 100644
--- a/wesnoth/src/ai/formula/ai.cpp
+++ b/wesnoth/src/ai/formula/ai.cpp
@@ -30,12 +30,12 @@
#include "../manager.hpp"
#include "../../callable_objects.hpp"
-#include "../../foreach.hpp"
#include "../../formula_debugger.hpp"
#include "../../log.hpp"
#include "../../menu_events.hpp"
#include "../../terrain_filter.hpp"
#include "../../tod_manager.hpp"
+#include "../../foreach.hpp"
static lg::log_domain log_formula_ai("ai/engine/fai");
#define DBG_AI LOG_STREAM(debug, log_formula_ai)
diff --git a/wesnoth/src/ai/formula/candidates.cpp b/wesnoth/src/ai/formula/candidates.cpp
index 1f90ff4..1ebd4b3 100644
--- a/wesnoth/src/ai/formula/candidates.cpp
+++ b/wesnoth/src/ai/formula/candidates.cpp
@@ -18,8 +18,8 @@
#include "ai.hpp"
#include "candidates.hpp"
-#include "foreach.hpp"
#include "../../log.hpp"
+#include "foreach.hpp"
static lg::log_domain log_formula_ai("ai/engine/fai");
#define ERR_AI LOG_STREAM(err, log_formula_ai)
diff --git a/wesnoth/src/ai/formula/function_table.cpp b/wesnoth/src/ai/formula/function_table.cpp
index df16b90..deb9c17 100644
--- a/wesnoth/src/ai/formula/function_table.cpp
+++ b/wesnoth/src/ai/formula/function_table.cpp
@@ -23,13 +23,13 @@
#include "../../attack_prediction.hpp"
#include "../../filesystem.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
#include "../../map_label.hpp"
#include "../../menu_events.hpp"
#include "../../replay.hpp"
#include "../../terrain_filter.hpp"
#include "../../unit.hpp"
+#include "../../foreach.hpp"
static lg::log_domain log_formula_ai("ai/engine/fai");
#define LOG_AI LOG_STREAM(info, log_formula_ai)
diff --git a/wesnoth/src/ai/formula/stage_side_formulas.cpp b/wesnoth/src/ai/formula/stage_side_formulas.cpp
index 8fc20f0..5b73e8e 100644
--- a/wesnoth/src/ai/formula/stage_side_formulas.cpp
+++ b/wesnoth/src/ai/formula/stage_side_formulas.cpp
@@ -21,11 +21,11 @@
#include "stage_side_formulas.hpp"
#include "ai.hpp"
-#include "../../foreach.hpp"
#include "../../formula.hpp"
#include "../../formula_function.hpp"
#include "../../log.hpp"
#include <boost/lexical_cast.hpp>
+#include "../../foreach.hpp"
static lg::log_domain log_ai("ai/stage/side_formulas");
#define LOG_AI LOG_STREAM(info, log_ai)
diff --git a/wesnoth/src/ai/testing/aspect_attacks.cpp b/wesnoth/src/ai/testing/aspect_attacks.cpp
index 6a059a4..3578066 100644
--- a/wesnoth/src/ai/testing/aspect_attacks.cpp
+++ b/wesnoth/src/ai/testing/aspect_attacks.cpp
@@ -20,10 +20,10 @@
#include "aspect_attacks.hpp"
#include "../manager.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
#include "../../map.hpp"
#include "../../tod_manager.hpp"
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/testing/ca.cpp b/wesnoth/src/ai/testing/ca.cpp
index 7997d6b..f873e10 100644
--- a/wesnoth/src/ai/testing/ca.cpp
+++ b/wesnoth/src/ai/testing/ca.cpp
@@ -22,11 +22,11 @@
#include "../manager.hpp"
#include "../composite/engine.hpp"
#include "../composite/rca.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
#include "../../wml_exception.hpp"
#include <numeric>
+#include "../../foreach.hpp"
static lg::log_domain log_ai_testing_ai_default("ai/ca/testing_ai_default");
#define DBG_AI_TESTING_AI_DEFAULT LOG_STREAM(debug, log_ai_testing_ai_default)
diff --git a/wesnoth/src/ai/testing/ca_default_move_to_targets.cpp b/wesnoth/src/ai/testing/ca_default_move_to_targets.cpp
index ca594a7..00244b3 100644
--- a/wesnoth/src/ai/testing/ca_default_move_to_targets.cpp
+++ b/wesnoth/src/ai/testing/ca_default_move_to_targets.cpp
@@ -21,8 +21,8 @@
#include "../composite/ai.hpp"
#include "../actions.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/testing/ca_testing_move_to_targets.cpp b/wesnoth/src/ai/testing/ca_testing_move_to_targets.cpp
index 89ff745..740a0e0 100644
--- a/wesnoth/src/ai/testing/ca_testing_move_to_targets.cpp
+++ b/wesnoth/src/ai/testing/ca_testing_move_to_targets.cpp
@@ -21,8 +21,8 @@
#include "../composite/ai.hpp"
#include "../actions.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/testing/stage_fallback.cpp b/wesnoth/src/ai/testing/stage_fallback.cpp
index 9a3d313..63c2100 100644
--- a/wesnoth/src/ai/testing/stage_fallback.cpp
+++ b/wesnoth/src/ai/testing/stage_fallback.cpp
@@ -21,8 +21,8 @@
#include "../manager.hpp"
#include "../composite/ai.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/ai/testing/stage_rca.cpp b/wesnoth/src/ai/testing/stage_rca.cpp
index 6c05c70..b574bda 100644
--- a/wesnoth/src/ai/testing/stage_rca.cpp
+++ b/wesnoth/src/ai/testing/stage_rca.cpp
@@ -21,10 +21,10 @@
#include "../composite/ai.hpp"
#include "../gamestate_observer.hpp"
-#include "../../foreach.hpp"
#include "../../log.hpp"
#include <boost/bind.hpp>
+#include "../../foreach.hpp"
namespace ai {
diff --git a/wesnoth/src/builder.cpp b/wesnoth/src/builder.cpp
index 43d78e9..2664fe0 100644
--- a/wesnoth/src/builder.cpp
+++ b/wesnoth/src/builder.cpp
@@ -21,13 +21,13 @@
#include "builder.hpp"
#include "config.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "map.hpp"
#include "serialization/string_utils.hpp"
#include "image.hpp"
#include <climits>
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
diff --git a/wesnoth/src/campaign_server/campaign_server.cpp b/wesnoth/src/campaign_server/campaign_server.cpp
index cef2512..ba556c5 100644
--- a/wesnoth/src/campaign_server/campaign_server.cpp
+++ b/wesnoth/src/campaign_server/campaign_server.cpp
@@ -20,7 +20,6 @@
*/
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "network_worker.hpp"
#include "serialization/binary_or_text.hpp"
@@ -36,6 +35,7 @@
#include <csignal>
#include <boost/iostreams/filter/gzip.hpp>
+#include "foreach.hpp"
// the fork execute is unix specific only tested on Linux quite sure it won't
// work on Windows not sure which other platforms have a problem with it.
diff --git a/wesnoth/src/cavegen.cpp b/wesnoth/src/cavegen.cpp
index 8eab966..1af4ce2 100644
--- a/wesnoth/src/cavegen.cpp
+++ b/wesnoth/src/cavegen.cpp
@@ -20,11 +20,11 @@
#include "global.hpp"
#include "cavegen.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "map.hpp"
#include "pathfind/pathfind.hpp"
#include "util.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define LOG_NG LOG_STREAM(info, log_engine)
diff --git a/wesnoth/src/config.cpp b/wesnoth/src/config.cpp
index c234e70..5fa2179 100644
--- a/wesnoth/src/config.cpp
+++ b/wesnoth/src/config.cpp
@@ -21,13 +21,13 @@
#include "global.hpp"
#include "config.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "serialization/string_utils.hpp"
#include "util.hpp"
#include <cstring>
#include <deque>
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
diff --git a/wesnoth/src/config_cache.cpp b/wesnoth/src/config_cache.cpp
index ac12436..7989f61 100644
--- a/wesnoth/src/config_cache.cpp
+++ b/wesnoth/src/config_cache.cpp
@@ -16,7 +16,6 @@
#include "config_cache.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "game_config.hpp"
#include "game_display.hpp"
@@ -28,6 +27,7 @@
#include "serialization/parser.hpp"
#include <boost/algorithm/string/replace.hpp>
+#include "foreach.hpp"
static lg::log_domain log_cache("cache");
#define ERR_CACHE LOG_STREAM(err, log_cache)
diff --git a/wesnoth/src/controller_base.cpp b/wesnoth/src/controller_base.cpp
index 934b970..59847ea 100644
--- a/wesnoth/src/controller_base.cpp
+++ b/wesnoth/src/controller_base.cpp
@@ -17,10 +17,10 @@
#include "dialogs.hpp"
#include "display.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "mouse_handler_base.hpp"
#include "preferences_display.hpp"
+#include "foreach.hpp"
static lg::log_domain log_display("display");
#define ERR_DP LOG_STREAM(err, log_display)
diff --git a/wesnoth/src/dialogs.cpp b/wesnoth/src/dialogs.cpp
index 2dc957e..0884691 100644
--- a/wesnoth/src/dialogs.cpp
+++ b/wesnoth/src/dialogs.cpp
@@ -20,7 +20,6 @@
#include "global.hpp"
#include "dialogs.hpp"
-#include "foreach.hpp"
#include "game_events.hpp"
#include "game_display.hpp"
#include "game_preferences.hpp"
@@ -51,6 +50,7 @@
//#endif
#include <clocale>
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define LOG_NG LOG_STREAM(info, log_engine)
diff --git a/wesnoth/src/display.cpp b/wesnoth/src/display.cpp
index c1777b1..90e084d 100644
--- a/wesnoth/src/display.cpp
+++ b/wesnoth/src/display.cpp
@@ -23,7 +23,6 @@
#include "cursor.hpp"
#include "display.hpp"
#include "events.hpp"
-#include "foreach.hpp"
#include "game_config.hpp"
#include "game_preferences.hpp"
#include "gettext.hpp"
@@ -52,6 +51,7 @@
#include <iostream>
#include <sstream>
+#include "foreach.hpp"
// Includes for bug #17573
#if defined(__GLIBC__)
#include <gnu/libc-version.h>
diff --git a/wesnoth/src/editor/action.cpp b/wesnoth/src/editor/action.cpp
index c73f7de..b1040e0 100644
--- a/wesnoth/src/editor/action.cpp
+++ b/wesnoth/src/editor/action.cpp
@@ -20,8 +20,8 @@
#include "action.hpp"
#include "map_context.hpp"
-#include "../foreach.hpp"
#include "../gettext.hpp"
+#include "../foreach.hpp"
namespace editor {
diff --git a/wesnoth/src/editor/brush.cpp b/wesnoth/src/editor/brush.cpp
index 1933c07..567ebde 100644
--- a/wesnoth/src/editor/brush.cpp
+++ b/wesnoth/src/editor/brush.cpp
@@ -16,10 +16,10 @@
#include "brush.hpp"
#include "editor_common.hpp"
-#include "../foreach.hpp"
#include "../pathutils.hpp"
#include "serialization/string_utils.hpp"
#include "util.hpp"
+#include "../foreach.hpp"
namespace editor {
diff --git a/wesnoth/src/editor/editor_controller.cpp b/wesnoth/src/editor/editor_controller.cpp
index b8ebf79..5f041a5 100644
--- a/wesnoth/src/editor/editor_controller.cpp
+++ b/wesnoth/src/editor/editor_controller.cpp
@@ -31,7 +31,6 @@
#include "../clipboard.hpp"
#include "../filechooser.hpp"
#include "../filesystem.hpp"
-#include "../foreach.hpp"
#include "../gettext.hpp"
#include "../map_create.hpp"
#include "../mapgen.hpp"
@@ -42,6 +41,7 @@
#include "formula_string_utils.hpp"
#include <boost/bind.hpp>
+#include "../foreach.hpp"
namespace editor {
diff --git a/wesnoth/src/editor/editor_map.cpp b/wesnoth/src/editor/editor_map.cpp
index 19d3c9f..6275244 100644
--- a/wesnoth/src/editor/editor_map.cpp
+++ b/wesnoth/src/editor/editor_map.cpp
@@ -19,12 +19,12 @@
#include "../display.hpp"
#include "../filesystem.hpp"
-#include "../foreach.hpp"
#include "../gettext.hpp"
#include "../map_exception.hpp"
#include "../map_label.hpp"
#include "../wml_exception.hpp"
+#include "../foreach.hpp"
namespace editor {
diff --git a/wesnoth/src/editor/editor_palettes.cpp b/wesnoth/src/editor/editor_palettes.cpp
index a4bca6f..a51f560 100644
--- a/wesnoth/src/editor/editor_palettes.cpp
+++ b/wesnoth/src/editor/editor_palettes.cpp
@@ -22,11 +22,11 @@
#include "editor_common.hpp"
#include "editor_palettes.hpp"
-#include "../foreach.hpp"
#include "../gettext.hpp"
#include "../serialization/string_utils.hpp"
#include "../sound.hpp"
#include "../tooltips.hpp"
+#include "../foreach.hpp"
namespace editor {
diff --git a/wesnoth/src/editor/map_context.cpp b/wesnoth/src/editor/map_context.cpp
index 7b66307..e63cb46 100644
--- a/wesnoth/src/editor/map_context.cpp
+++ b/wesnoth/src/editor/map_context.cpp
@@ -18,11 +18,11 @@
#include "../display.hpp"
#include "../filesystem.hpp"
-#include "../foreach.hpp"
#include "../gettext.hpp"
#include "../map_exception.hpp"
#include "../map_label.hpp"
#include "../wml_exception.hpp"
+#include "../foreach.hpp"
#include "formula_string_utils.hpp"
diff --git a/wesnoth/src/editor/map_fragment.cpp b/wesnoth/src/editor/map_fragment.cpp
index 3a417d0..18768f9 100644
--- a/wesnoth/src/editor/map_fragment.cpp
+++ b/wesnoth/src/editor/map_fragment.cpp
@@ -15,8 +15,8 @@
#include "map_fragment.hpp"
-#include "../foreach.hpp"
#include "util.hpp"
+#include "../foreach.hpp"
namespace editor {
diff --git a/wesnoth/src/filesystem.cpp b/wesnoth/src/filesystem.cpp
index 8e12dc1..c65de76 100644
--- a/wesnoth/src/filesystem.cpp
+++ b/wesnoth/src/filesystem.cpp
@@ -55,12 +55,12 @@ BPath be_path;
#include "config.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "game_config.hpp"
#include "game_preferences.hpp"
#include "log.hpp"
#include "loadscreen.hpp"
#include "scoped_resource.hpp"
+#include "foreach.hpp"
static lg::log_domain log_filesystem("filesystem");
#define DBG_FS LOG_STREAM(debug, log_filesystem)
diff --git a/wesnoth/src/font.cpp b/wesnoth/src/font.cpp
index 3f2b136..15be7f0 100644
--- a/wesnoth/src/font.cpp
+++ b/wesnoth/src/font.cpp
@@ -20,7 +20,6 @@
#include "config.hpp"
#include "filesystem.hpp"
#include "font.hpp"
-#include "foreach.hpp"
#include "game_config.hpp"
#include "log.hpp"
#include "marked-up_text.hpp"
@@ -55,6 +54,7 @@ static lg::log_domain log_font("font");
#ifdef HAVE_FRIBIDI
#include <fribidi.h>
#endif
+#include "foreach.hpp"
// Signed int. Negative values mean "no subset".
typedef int subset_id;
diff --git a/wesnoth/src/formula.cpp b/wesnoth/src/formula.cpp
index ceb157d..d98ad9d 100644
--- a/wesnoth/src/formula.cpp
+++ b/wesnoth/src/formula.cpp
@@ -16,11 +16,12 @@
#include <iostream>
#include <set>
-#include "foreach.hpp"
#include "formula_callable.hpp"
#include "formula_function.hpp"
#include "map_utils.hpp"
+#include "foreach.hpp"
+
namespace game_logic
{
diff --git a/wesnoth/src/formula_function.cpp b/wesnoth/src/formula_function.cpp
index 6c47ba3..d183ea1 100644
--- a/wesnoth/src/formula_function.cpp
+++ b/wesnoth/src/formula_function.cpp
@@ -15,13 +15,12 @@
#include "global.hpp"
-//#include "foreach.hpp"
#include "callable_objects.hpp"
-#include "foreach.hpp"
#include "formula_debugger.hpp"
#include "formula_function.hpp"
#include "game_display.hpp"
#include "log.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
diff --git a/wesnoth/src/formula_tokenizer.cpp b/wesnoth/src/formula_tokenizer.cpp
index 8457c26..b3a4069 100644
--- a/wesnoth/src/formula_tokenizer.cpp
+++ b/wesnoth/src/formula_tokenizer.cpp
@@ -13,8 +13,8 @@
#include <sstream>
-#include "foreach.hpp"
#include "formula_tokenizer.hpp"
+#include "foreach.hpp"
namespace formula_tokenizer
{
diff --git a/wesnoth/src/game.cpp b/wesnoth/src/game.cpp
index dd23fbf..b8b1f5e 100644
--- a/wesnoth/src/game.cpp
+++ b/wesnoth/src/game.cpp
@@ -28,7 +28,6 @@
#include "construct_dialog.hpp"
#include "cursor.hpp"
#include "dialogs.hpp"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "builder.hpp"
#include "filesystem.hpp"
@@ -105,6 +104,7 @@
#include <boost/iostreams/copy.hpp>
#include <boost/iostreams/filtering_streambuf.hpp>
#include <boost/iostreams/filter/gzip.hpp>
+#include "foreach.hpp"
// Minimum stack cookie to prevent stack overflow on AmigaOS4
#ifdef __amigaos4__
diff --git a/wesnoth/src/game_config.cpp b/wesnoth/src/game_config.cpp
index fc3529b..1e051d8 100644
--- a/wesnoth/src/game_config.cpp
+++ b/wesnoth/src/game_config.cpp
@@ -17,7 +17,6 @@
#include "color_range.hpp"
#include "config.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "log.hpp"
#include "util.hpp"
@@ -27,6 +26,7 @@
#ifdef HAVE_REVISION
#include "revision.hpp"
#endif /* HAVE_REVISION */
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define DBG_NG LOG_STREAM(debug, log_engine)
diff --git a/wesnoth/src/game_display.cpp b/wesnoth/src/game_display.cpp
index ffc4476..319786e 100644
--- a/wesnoth/src/game_display.cpp
+++ b/wesnoth/src/game_display.cpp
@@ -34,7 +34,6 @@ Growl_Delegate growl_obj;
#endif
#include "actions.hpp"
-#include "foreach.hpp"
#include "halo.hpp"
#include "log.hpp"
#include "map.hpp"
@@ -43,6 +42,7 @@ Growl_Delegate growl_obj;
#include "game_preferences.hpp"
#include "tod_manager.hpp"
#include "sound.hpp"
+#include "foreach.hpp"
static lg::log_domain log_display("display");
#define ERR_DP LOG_STREAM(err, log_display)
diff --git a/wesnoth/src/game_events.cpp b/wesnoth/src/game_events.cpp
index 1969890..24734ad 100644
--- a/wesnoth/src/game_events.cpp
+++ b/wesnoth/src/game_events.cpp
@@ -22,7 +22,6 @@
#include "actions.hpp"
#include "ai/manager.hpp"
#include "dialogs.hpp"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "game_events.hpp"
#include "game_preferences.hpp"
@@ -51,6 +50,7 @@
#include <algorithm>
#include <iomanip>
#include <iostream>
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define DBG_NG LOG_STREAM(debug, log_engine)
diff --git a/wesnoth/src/game_preferences.cpp b/wesnoth/src/game_preferences.cpp
index f08fc2d..7db62da 100644
--- a/wesnoth/src/game_preferences.cpp
+++ b/wesnoth/src/game_preferences.cpp
@@ -16,7 +16,6 @@
#define GETTEXT_DOMAIN "wesnoth-lib"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "game_preferences.hpp"
#include "gamestatus.hpp"
@@ -29,6 +28,7 @@
#include "unit.hpp"
#include "unit_map.hpp"
#include "wml_exception.hpp"
+#include "foreach.hpp"
namespace {
diff --git a/wesnoth/src/game_preferences_display.cpp b/wesnoth/src/game_preferences_display.cpp
index a2cc30d..4d88f63 100644
--- a/wesnoth/src/game_preferences_display.cpp
+++ b/wesnoth/src/game_preferences_display.cpp
@@ -18,7 +18,6 @@
#include "display.hpp"
#include "filesystem.hpp"
#include "filechooser.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/dialogs/transient_message.hpp"
#include "lobby_preferences.hpp"
@@ -26,6 +25,7 @@
#include "wml_separators.hpp"
#include "widgets/slider.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
namespace preferences {
diff --git a/wesnoth/src/gamestatus.cpp b/wesnoth/src/gamestatus.cpp
index ead472f..b7428df 100644
--- a/wesnoth/src/gamestatus.cpp
+++ b/wesnoth/src/gamestatus.cpp
@@ -23,7 +23,6 @@
#include "gamestatus.hpp"
#include "actions.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "log.hpp"
#include "game_preferences.hpp"
@@ -43,6 +42,7 @@
#ifndef _MSC_VER
#include <sys/time.h>
#endif
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
diff --git a/wesnoth/src/generate_report.cpp b/wesnoth/src/generate_report.cpp
index d496cfd..c502ab4 100644
--- a/wesnoth/src/generate_report.cpp
+++ b/wesnoth/src/generate_report.cpp
@@ -22,7 +22,6 @@
#include "actions.hpp"
#include "font.hpp"
-#include "foreach.hpp"
#include "game_preferences.hpp"
#include "gettext.hpp"
#include "language.hpp"
@@ -35,6 +34,7 @@
#include <iostream>
#include <ctime>
+#include "foreach.hpp"
namespace reports {
diff --git a/wesnoth/src/gui/auxiliary/canvas.cpp b/wesnoth/src/gui/auxiliary/canvas.cpp
index 91d2ef7..ff5b9ae 100644
--- a/wesnoth/src/gui/auxiliary/canvas.cpp
+++ b/wesnoth/src/gui/auxiliary/canvas.cpp
@@ -23,13 +23,13 @@
#include "config.hpp"
#include "../../image.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/formula.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/widgets/helper.hpp"
#include "../../text.hpp"
#include "wml_exception.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/event/dispatcher.cpp b/wesnoth/src/gui/auxiliary/event/dispatcher.cpp
index ace851a..029aba0 100644
--- a/wesnoth/src/gui/auxiliary/event/dispatcher.cpp
+++ b/wesnoth/src/gui/auxiliary/event/dispatcher.cpp
@@ -16,8 +16,8 @@
#include "gui/auxiliary/event/dispatcher_private.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/log.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/event/handler.cpp b/wesnoth/src/gui/auxiliary/event/handler.cpp
index 98416d1..40ee90f 100644
--- a/wesnoth/src/gui/auxiliary/event/handler.cpp
+++ b/wesnoth/src/gui/auxiliary/event/handler.cpp
@@ -17,7 +17,6 @@
#include "gui/auxiliary/event/handler.hpp"
#include "clipboard.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/event/dispatcher.hpp"
#include "gui/auxiliary/timer.hpp"
#include "gui/auxiliary/log.hpp"
@@ -28,6 +27,7 @@
#include "video.hpp"
#include <cassert>
+#include "foreach.hpp"
/**
* @todo The items below are not implemented yet.
diff --git a/wesnoth/src/gui/auxiliary/widget_definition.hpp b/wesnoth/src/gui/auxiliary/widget_definition.hpp
index 2434ed6..ef68698 100644
--- a/wesnoth/src/gui/auxiliary/widget_definition.hpp
+++ b/wesnoth/src/gui/auxiliary/widget_definition.hpp
@@ -16,8 +16,8 @@
#define GUI_AUXILIARY_WIDGET_DEFINITION_HPP_INCLUDED
#include "config.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/canvas.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/window_builder.cpp b/wesnoth/src/gui/auxiliary/window_builder.cpp
index 3bd30ff..b462d1d 100644
--- a/wesnoth/src/gui/auxiliary/window_builder.cpp
+++ b/wesnoth/src/gui/auxiliary/window_builder.cpp
@@ -17,7 +17,6 @@
#include "gui/auxiliary/window_builder_private.hpp"
#include "asserts.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/window_builder/button.hpp"
@@ -46,6 +45,7 @@
#include "gui/widgets/settings.hpp"
#include "gui/widgets/window.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/window_builder/helper.cpp b/wesnoth/src/gui/auxiliary/window_builder/helper.cpp
index d382516..cacd6b5 100644
--- a/wesnoth/src/gui/auxiliary/window_builder/helper.cpp
+++ b/wesnoth/src/gui/auxiliary/window_builder/helper.cpp
@@ -17,10 +17,10 @@
#include "gui/auxiliary/window_builder/helper.hpp"
#include "config.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/widgets/grid.hpp"
#include "gui/widgets/window.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/window_builder/horizontal_listbox.cpp b/wesnoth/src/gui/auxiliary/window_builder/horizontal_listbox.cpp
index 602f5e9..5c2882b 100644
--- a/wesnoth/src/gui/auxiliary/window_builder/horizontal_listbox.cpp
+++ b/wesnoth/src/gui/auxiliary/window_builder/horizontal_listbox.cpp
@@ -16,13 +16,13 @@
#include "gui/auxiliary/window_builder/horizontal_listbox.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/widget_definition/listbox.hpp"
#include "gui/auxiliary/window_builder/helper.hpp"
#include "gui/widgets/listbox.hpp"
#include "wml_exception.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/window_builder/listbox.cpp b/wesnoth/src/gui/auxiliary/window_builder/listbox.cpp
index 07d7c23..3a809cd 100644
--- a/wesnoth/src/gui/auxiliary/window_builder/listbox.cpp
+++ b/wesnoth/src/gui/auxiliary/window_builder/listbox.cpp
@@ -16,13 +16,13 @@
#include "gui/auxiliary/window_builder/listbox.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/widget_definition/listbox.hpp"
#include "gui/auxiliary/window_builder/helper.hpp"
#include "gui/widgets/listbox.hpp"
#include "wml_exception.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/window_builder/menubar.cpp b/wesnoth/src/gui/auxiliary/window_builder/menubar.cpp
index 8471512..057b69f 100644
--- a/wesnoth/src/gui/auxiliary/window_builder/menubar.cpp
+++ b/wesnoth/src/gui/auxiliary/window_builder/menubar.cpp
@@ -17,8 +17,8 @@
#include "gui/auxiliary/window_builder/menubar.hpp"
#include "config.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/log.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/window_builder/multi_page.cpp b/wesnoth/src/gui/auxiliary/window_builder/multi_page.cpp
index d897adc..c557b56 100644
--- a/wesnoth/src/gui/auxiliary/window_builder/multi_page.cpp
+++ b/wesnoth/src/gui/auxiliary/window_builder/multi_page.cpp
@@ -17,12 +17,12 @@
#include "gui/auxiliary/window_builder/multi_page.hpp"
#include "config.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/widget_definition/multi_page.hpp"
#include "gui/widgets/multi_page.hpp"
#include "wml_exception.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/window_builder/slider.cpp b/wesnoth/src/gui/auxiliary/window_builder/slider.cpp
index 6666d1e..925cb3c 100644
--- a/wesnoth/src/gui/auxiliary/window_builder/slider.cpp
+++ b/wesnoth/src/gui/auxiliary/window_builder/slider.cpp
@@ -17,11 +17,11 @@
#include "gui/auxiliary/window_builder/slider.hpp"
#include "config.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/widgets/slider.hpp"
#include "wml_exception.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/window_builder/stacked_widget.cpp b/wesnoth/src/gui/auxiliary/window_builder/stacked_widget.cpp
index aea31a5..584ad2b 100644
--- a/wesnoth/src/gui/auxiliary/window_builder/stacked_widget.cpp
+++ b/wesnoth/src/gui/auxiliary/window_builder/stacked_widget.cpp
@@ -17,12 +17,12 @@
#include "gui/auxiliary/window_builder/stacked_widget.hpp"
#include "config.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/widget_definition/stacked_widget.hpp"
#include "gui/widgets/stacked_widget.hpp"
#include "wml_exception.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/auxiliary/window_builder/tree_view.cpp b/wesnoth/src/gui/auxiliary/window_builder/tree_view.cpp
index fbf0023..122fbaa 100644
--- a/wesnoth/src/gui/auxiliary/window_builder/tree_view.cpp
+++ b/wesnoth/src/gui/auxiliary/window_builder/tree_view.cpp
@@ -16,13 +16,13 @@
#include "gui/auxiliary/window_builder/tree_view.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/widget_definition/tree_view.hpp"
#include "gui/auxiliary/window_builder/helper.hpp"
#include "gui/widgets/tree_view.hpp"
#include "wml_exception.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/dialogs/addon_list.cpp b/wesnoth/src/gui/dialogs/addon_list.cpp
index e9a08b2..a119317 100644
--- a/wesnoth/src/gui/dialogs/addon_list.cpp
+++ b/wesnoth/src/gui/dialogs/addon_list.cpp
@@ -16,11 +16,12 @@
#include "gui/dialogs/addon_list.hpp"
-#include "foreach.hpp"
#include "gui/widgets/listbox.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/window.hpp"
+#include "foreach.hpp"
+
namespace gui2 {
/*WIKI
diff --git a/wesnoth/src/gui/dialogs/campaign_selection.cpp b/wesnoth/src/gui/dialogs/campaign_selection.cpp
index 20549d9..df0c6ba 100644
--- a/wesnoth/src/gui/dialogs/campaign_selection.cpp
+++ b/wesnoth/src/gui/dialogs/campaign_selection.cpp
@@ -16,7 +16,6 @@
#include "gui/dialogs/campaign_selection.hpp"
-#include "foreach.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/widgets/image.hpp"
#include "gui/widgets/listbox.hpp"
@@ -29,6 +28,7 @@
#include "serialization/string_utils.hpp"
#include <boost/bind.hpp>
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/dialogs/chat_log.cpp b/wesnoth/src/gui/dialogs/chat_log.cpp
index 7845cd9..6704a22 100644
--- a/wesnoth/src/gui/dialogs/chat_log.cpp
+++ b/wesnoth/src/gui/dialogs/chat_log.cpp
@@ -28,7 +28,6 @@
#include "gui/widgets/window.hpp"
#include "gui/widgets/slider.hpp"
-#include "../../foreach.hpp"
#include "../../gamestatus.hpp"
#include "../../log.hpp"
#include "../../resources.hpp"
@@ -38,6 +37,7 @@
#include <vector>
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
+#include "../../foreach.hpp"
static lg::log_domain log_chat_log("chat_log");
#define DBG_CHAT_LOG LOG_STREAM(debug, log_chat_log)
diff --git a/wesnoth/src/gui/dialogs/dialog.cpp b/wesnoth/src/gui/dialogs/dialog.cpp
index 095d5fe..1653b39 100644
--- a/wesnoth/src/gui/dialogs/dialog.cpp
+++ b/wesnoth/src/gui/dialogs/dialog.cpp
@@ -16,10 +16,10 @@
#include "gui/dialogs/dialog.hpp"
-#include "foreach.hpp"
#include "gui/dialogs/field.hpp"
#include "gui/widgets/integer_selector.hpp"
#include "video.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/dialogs/formula_debugger.cpp b/wesnoth/src/gui/dialogs/formula_debugger.cpp
index 2545f4b..f0f50cb 100644
--- a/wesnoth/src/gui/dialogs/formula_debugger.cpp
+++ b/wesnoth/src/gui/dialogs/formula_debugger.cpp
@@ -20,10 +20,10 @@
#include "gui/widgets/button.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/window.hpp"
-#include "../../foreach.hpp"
#include "../../formula_debugger.hpp"
#include <boost/bind.hpp>
+#include "../../foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/dialogs/game_load.cpp b/wesnoth/src/gui/dialogs/game_load.cpp
index 08a77e2..faae8a1 100644
--- a/wesnoth/src/gui/dialogs/game_load.cpp
+++ b/wesnoth/src/gui/dialogs/game_load.cpp
@@ -16,7 +16,6 @@
#include "gui/dialogs/game_load.hpp"
-#include "foreach.hpp"
#include "formula_string_utils.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/log.hpp"
@@ -37,6 +36,8 @@
#include <cctype>
#include <boost/bind.hpp>
+#include "foreach.hpp"
+
namespace gui2 {
/*WIKI
diff --git a/wesnoth/src/gui/dialogs/game_save.cpp b/wesnoth/src/gui/dialogs/game_save.cpp
index 0955e61..e1a7f2f 100644
--- a/wesnoth/src/gui/dialogs/game_save.cpp
+++ b/wesnoth/src/gui/dialogs/game_save.cpp
@@ -16,12 +16,12 @@
#include "gui/dialogs/game_save.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/dialogs/field.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/label.hpp"
#include "gui/widgets/settings.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/dialogs/gamestate_inspector.cpp b/wesnoth/src/gui/dialogs/gamestate_inspector.cpp
index 862fad2..79c17cd 100644
--- a/wesnoth/src/gui/dialogs/gamestate_inspector.cpp
+++ b/wesnoth/src/gui/dialogs/gamestate_inspector.cpp
@@ -22,7 +22,6 @@
#include "gui/widgets/settings.hpp"
#include "gui/widgets/window.hpp"
-#include "../../foreach.hpp"
#include "../../gamestatus.hpp"
#include "../../resources.hpp"
#include "../../team.hpp"
@@ -31,6 +30,7 @@
#include <vector>
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
+#include "../../foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/dialogs/language_selection.cpp b/wesnoth/src/gui/dialogs/language_selection.cpp
index 392701b..996b7e4 100644
--- a/wesnoth/src/gui/dialogs/language_selection.cpp
+++ b/wesnoth/src/gui/dialogs/language_selection.cpp
@@ -16,13 +16,14 @@
#include "gui/dialogs/language_selection.hpp"
-#include "foreach.hpp"
#include "gui/widgets/listbox.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/window.hpp"
#include "language.hpp"
#include "preferences.hpp"
+#include "foreach.hpp"
+
namespace gui2 {
/*WIKI
diff --git a/wesnoth/src/gui/dialogs/lobby/lobby_data.cpp b/wesnoth/src/gui/dialogs/lobby/lobby_data.cpp
index 619d576..715b633 100644
--- a/wesnoth/src/gui/dialogs/lobby/lobby_data.cpp
+++ b/wesnoth/src/gui/dialogs/lobby/lobby_data.cpp
@@ -17,7 +17,6 @@
#include "config.hpp"
#include "game_preferences.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "formula_string_utils.hpp"
#include "gettext.hpp"
#include "network.hpp"
@@ -27,6 +26,7 @@
#include "wml_exception.hpp"
#include <iterator>
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
diff --git a/wesnoth/src/gui/dialogs/lobby/lobby_info.cpp b/wesnoth/src/gui/dialogs/lobby/lobby_info.cpp
index a879d68..9b53433 100644
--- a/wesnoth/src/gui/dialogs/lobby/lobby_info.cpp
+++ b/wesnoth/src/gui/dialogs/lobby/lobby_info.cpp
@@ -17,7 +17,6 @@
#include "config.hpp"
#include "game_preferences.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "formula_string_utils.hpp"
#include "gettext.hpp"
#include "network.hpp"
@@ -27,6 +26,7 @@
#include "wml_exception.hpp"
#include <iterator>
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
diff --git a/wesnoth/src/gui/dialogs/lobby_main.cpp b/wesnoth/src/gui/dialogs/lobby_main.cpp
index 2d86bbb..22bc70d 100644
--- a/wesnoth/src/gui/dialogs/lobby_main.cpp
+++ b/wesnoth/src/gui/dialogs/lobby_main.cpp
@@ -33,7 +33,6 @@
#include "gui/widgets/toggle_panel.hpp"
#include "gui/widgets/tree_view_node.hpp"
-#include "foreach.hpp"
#include "formula_string_utils.hpp"
#include "game_preferences.hpp"
#include "gettext.hpp"
@@ -45,6 +44,7 @@
#include "sound.hpp"
#include <boost/bind.hpp>
+#include "foreach.hpp"
static lg::log_domain log_network("network");
#define DBG_NW LOG_STREAM(debug, log_network)
diff --git a/wesnoth/src/gui/dialogs/message.cpp b/wesnoth/src/gui/dialogs/message.cpp
index fb8aee1..650d2fb 100644
--- a/wesnoth/src/gui/dialogs/message.cpp
+++ b/wesnoth/src/gui/dialogs/message.cpp
@@ -16,7 +16,6 @@
#include "gui/dialogs/message.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/image.hpp"
@@ -24,6 +23,7 @@
#include "gui/widgets/settings.hpp"
#include "gui/widgets/window.hpp"
#include "log.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/dialogs/mp_connect.cpp b/wesnoth/src/gui/dialogs/mp_connect.cpp
index 5f2ff8c..12e5a8c 100644
--- a/wesnoth/src/gui/dialogs/mp_connect.cpp
+++ b/wesnoth/src/gui/dialogs/mp_connect.cpp
@@ -16,7 +16,6 @@
#include "gui/dialogs/mp_connect.hpp"
-#include "foreach.hpp"
#include "game_preferences.hpp"
#include "gui/dialogs/field.hpp"
#include "gui/widgets/button.hpp"
@@ -28,6 +27,7 @@
#include "gui/widgets/toggle_button.hpp"
#include <boost/bind.hpp>
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/dialogs/mp_create_game.cpp b/wesnoth/src/gui/dialogs/mp_create_game.cpp
index 1618867..756aacb 100644
--- a/wesnoth/src/gui/dialogs/mp_create_game.cpp
+++ b/wesnoth/src/gui/dialogs/mp_create_game.cpp
@@ -16,7 +16,6 @@
#include "gui/dialogs/mp_create_game.hpp"
-#include "foreach.hpp"
#include "game_preferences.hpp"
#include "gettext.hpp"
#include "gui/dialogs/field.hpp"
@@ -27,6 +26,7 @@
#include "gui/widgets/settings.hpp"
#include "../../settings.hpp"
+#include "foreach.hpp"
namespace gui2 {
tmp_create_game::tmp_create_game(const config& cfg) :
diff --git a/wesnoth/src/gui/dialogs/unit_create.cpp b/wesnoth/src/gui/dialogs/unit_create.cpp
index d3b27af..c61b11f 100644
--- a/wesnoth/src/gui/dialogs/unit_create.cpp
+++ b/wesnoth/src/gui/dialogs/unit_create.cpp
@@ -22,8 +22,8 @@
#include "gui/widgets/settings.hpp"
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/window.hpp"
-#include "foreach.hpp"
#include "unit_types.hpp"
+#include "foreach.hpp"
namespace {
static std::string last_chosen_type_id = "";
diff --git a/wesnoth/src/gui/dialogs/wml_message.cpp b/wesnoth/src/gui/dialogs/wml_message.cpp
index 2b75089..11ec66c 100644
--- a/wesnoth/src/gui/dialogs/wml_message.cpp
+++ b/wesnoth/src/gui/dialogs/wml_message.cpp
@@ -16,13 +16,13 @@
#include "gui/dialogs/wml_message.hpp"
-#include "foreach.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/label.hpp"
#include "gui/widgets/listbox.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/text_box.hpp"
#include "gui/widgets/window.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/widgets/control.cpp b/wesnoth/src/gui/widgets/control.cpp
index 342b55d..7ff0823 100644
--- a/wesnoth/src/gui/widgets/control.cpp
+++ b/wesnoth/src/gui/widgets/control.cpp
@@ -17,13 +17,13 @@
#include "control.hpp"
#include "font.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/window.hpp"
#include "marked-up_text.hpp"
#include <iomanip>
+#include "foreach.hpp"
#define LOG_SCOPE_HEADER "tcontrol(" + get_control_type() + ") [" \
+ id() + "] " + __func__
diff --git a/wesnoth/src/gui/widgets/debug.cpp b/wesnoth/src/gui/widgets/debug.cpp
index dfd1a98..897461e 100644
--- a/wesnoth/src/gui/widgets/debug.cpp
+++ b/wesnoth/src/gui/widgets/debug.cpp
@@ -19,7 +19,6 @@
#include "gui/widgets/debug.hpp"
-#include "foreach.hpp"
#include "formatter.hpp"
#include "gui/widgets/generator.hpp"
#include "gui/widgets/listbox.hpp"
@@ -29,6 +28,7 @@
#include <fstream>
#include <iostream>
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/widgets/generator_private.hpp b/wesnoth/src/gui/widgets/generator_private.hpp
index 009bac5..ae141a1 100644
--- a/wesnoth/src/gui/widgets/generator_private.hpp
+++ b/wesnoth/src/gui/widgets/generator_private.hpp
@@ -18,11 +18,11 @@
#include "gui/widgets/generator.hpp"
#include "asserts.hpp"
-#include "foreach.hpp"
#include "gui/widgets/grid.hpp"
#include "gui/widgets/selectable.hpp"
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/toggle_panel.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/widgets/scrollbar.cpp b/wesnoth/src/gui/widgets/scrollbar.cpp
index f8a98b1..40b8e8c 100644
--- a/wesnoth/src/gui/widgets/scrollbar.cpp
+++ b/wesnoth/src/gui/widgets/scrollbar.cpp
@@ -16,11 +16,11 @@
#include "gui/widgets/scrollbar.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/widgets/window.hpp" // Needed for invalidate_layout()
#include <boost/bind.hpp>
+#include "foreach.hpp"
#define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
#define LOG_HEADER LOG_SCOPE_HEADER + ':'
diff --git a/wesnoth/src/gui/widgets/scrollbar_container.cpp b/wesnoth/src/gui/widgets/scrollbar_container.cpp
index 565cdff..73d03b1 100644
--- a/wesnoth/src/gui/widgets/scrollbar_container.cpp
+++ b/wesnoth/src/gui/widgets/scrollbar_container.cpp
@@ -16,7 +16,6 @@
#include "gui/widgets/scrollbar_container_private.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/layout_exception.hpp"
#include "gui/widgets/clickable.hpp"
@@ -24,6 +23,7 @@
#include "gui/widgets/window.hpp"
#include <boost/bind.hpp>
+#include "foreach.hpp"
#define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
#define LOG_HEADER LOG_SCOPE_HEADER + ':'
diff --git a/wesnoth/src/gui/widgets/settings.cpp b/wesnoth/src/gui/widgets/settings.cpp
index 2cf4322..a02c186 100644
--- a/wesnoth/src/gui/widgets/settings.cpp
+++ b/wesnoth/src/gui/widgets/settings.cpp
@@ -24,7 +24,6 @@
#include "asserts.hpp"
#include "config_cache.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/widget_definition/button.hpp"
@@ -52,6 +51,7 @@
#include "serialization/parser.hpp"
#include "serialization/preprocessor.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/widgets/slider.cpp b/wesnoth/src/gui/widgets/slider.cpp
index 0ff930f..c49dece 100644
--- a/wesnoth/src/gui/widgets/slider.cpp
+++ b/wesnoth/src/gui/widgets/slider.cpp
@@ -16,12 +16,12 @@
#include "gui/widgets/slider.hpp"
-#include "foreach.hpp"
#include "formatter.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/widget_definition/slider.hpp"
#include "gui/widgets/settings.hpp"
#include "sound.hpp"
+#include "foreach.hpp"
#define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
#define LOG_HEADER LOG_SCOPE_HEADER + ':'
diff --git a/wesnoth/src/gui/widgets/stacked_widget.cpp b/wesnoth/src/gui/widgets/stacked_widget.cpp
index 57236ab..cc99e9e 100644
--- a/wesnoth/src/gui/widgets/stacked_widget.cpp
+++ b/wesnoth/src/gui/widgets/stacked_widget.cpp
@@ -16,8 +16,8 @@
#include "gui/widgets/stacked_widget.hpp"
-#include "foreach.hpp"
#include "gui/widgets/generator.hpp"
+#include "foreach.hpp"
namespace gui2 {
diff --git a/wesnoth/src/gui/widgets/text_box.cpp b/wesnoth/src/gui/widgets/text_box.cpp
index ef91349..ca8f3b0 100644
--- a/wesnoth/src/gui/widgets/text_box.cpp
+++ b/wesnoth/src/gui/widgets/text_box.cpp
@@ -17,13 +17,14 @@
#include "gui/widgets/text_box.hpp"
#include "font.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/widget_definition/text_box.hpp"
#include "gui/widgets/window.hpp"
#include "game_preferences.hpp"
#include <boost/bind.hpp>
+#include "foreach.hpp"
+
#define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
#define LOG_HEADER LOG_SCOPE_HEADER + ':'
diff --git a/wesnoth/src/gui/widgets/toggle_button.cpp b/wesnoth/src/gui/widgets/toggle_button.cpp
index 7027b39..212c3c0 100644
--- a/wesnoth/src/gui/widgets/toggle_button.cpp
+++ b/wesnoth/src/gui/widgets/toggle_button.cpp
@@ -16,13 +16,13 @@
#include "gui/widgets/toggle_button.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/widgets/settings.hpp"
#include "gui/widgets/window.hpp"
#include "sound.hpp"
#include <boost/bind.hpp>
+#include "foreach.hpp"
#define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
#define LOG_HEADER LOG_SCOPE_HEADER + ':'
diff --git a/wesnoth/src/gui/widgets/toggle_panel.cpp b/wesnoth/src/gui/widgets/toggle_panel.cpp
index fe14e6e..58e9927 100644
--- a/wesnoth/src/gui/widgets/toggle_panel.cpp
+++ b/wesnoth/src/gui/widgets/toggle_panel.cpp
@@ -16,7 +16,6 @@
#include "gui/widgets/toggle_panel.hpp"
-#include "foreach.hpp"
#include "gui/auxiliary/log.hpp"
#include "gui/auxiliary/widget_definition/toggle_panel.hpp"
#include "gui/widgets/settings.hpp"
@@ -24,6 +23,7 @@
#include "sound.hpp"
#include <boost/bind.hpp>
+#include "foreach.hpp"
#define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
#define LOG_HEADER LOG_SCOPE_HEADER + ':'
diff --git a/wesnoth/src/gui/widgets/window.cpp b/wesnoth/src/gui/widgets/window.cpp
index 1e939dc..75a3bab 100644
--- a/wesnoth/src/gui/widgets/window.cpp
+++ b/wesnoth/src/gui/widgets/window.cpp
@@ -22,7 +22,6 @@
#include "gui/widgets/window_private.hpp"
#include "font.hpp"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "gettext.hpp"
#include "log.hpp"
@@ -40,6 +39,7 @@
#include "video.hpp"
#include <boost/bind.hpp>
+#include "foreach.hpp"
#define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
#define LOG_HEADER LOG_SCOPE_HEADER + ':'
diff --git a/wesnoth/src/help.cpp b/wesnoth/src/help.cpp
index 5eddd69..9101b14 100644
--- a/wesnoth/src/help.cpp
+++ b/wesnoth/src/help.cpp
@@ -23,7 +23,6 @@
#include "about.hpp"
#include "display.hpp"
-#include "foreach.hpp"
#include "game_preferences.hpp"
#include "gettext.hpp"
#include "gui/dialogs/transient_message.hpp"
@@ -36,6 +35,8 @@
#include "serialization/parser.hpp"
#include <queue>
+#include "foreach.hpp"
+
static lg::log_domain log_display("display");
#define WRN_DP LOG_STREAM(warn, log_display)
diff --git a/wesnoth/src/hotkeys.cpp b/wesnoth/src/hotkeys.cpp
index 27d89c0..22d9410 100644
--- a/wesnoth/src/hotkeys.cpp
+++ b/wesnoth/src/hotkeys.cpp
@@ -18,7 +18,6 @@
#include "construct_dialog.hpp"
#include "display.hpp"
-#include "foreach.hpp"
#include "hotkeys.hpp"
#include "game_end_exceptions.hpp"
#include "gettext.hpp"
@@ -27,6 +26,7 @@
#include "preferences_display.hpp"
#include "wesconfig.h"
#include "wml_separators.hpp"
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_G LOG_STREAM(err, lg::general)
diff --git a/wesnoth/src/image.cpp b/wesnoth/src/image.cpp
index cbca7de..6ad374d 100644
--- a/wesnoth/src/image.cpp
+++ b/wesnoth/src/image.cpp
@@ -24,7 +24,6 @@
#include "color_range.hpp"
#include "config.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "game_config.hpp"
#include "image.hpp"
#include "image_function.hpp"
@@ -37,6 +36,7 @@
#include <boost/functional/hash.hpp>
#include <set>
+#include "foreach.hpp"
static lg::log_domain log_display("display");
#define ERR_DP LOG_STREAM(err, log_display)
diff --git a/wesnoth/src/intro.cpp b/wesnoth/src/intro.cpp
index 57ac370..98c65c4 100644
--- a/wesnoth/src/intro.cpp
+++ b/wesnoth/src/intro.cpp
@@ -23,7 +23,6 @@
#include "intro.hpp"
#include "display.hpp"
-#include "foreach.hpp"
#include "game_events.hpp"
#include "gettext.hpp"
#include "language.hpp"
@@ -34,6 +33,8 @@
#include "unit.hpp"
#include "variable.hpp"
+#include "foreach.hpp"
+
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
#define LOG_NG LOG_STREAM(info, log_engine)
diff --git a/wesnoth/src/language.cpp b/wesnoth/src/language.cpp
index 795c39f..103d4ea 100644
--- a/wesnoth/src/language.cpp
+++ b/wesnoth/src/language.cpp
@@ -15,7 +15,6 @@
#include "global.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "language.hpp"
#include "log.hpp"
@@ -37,6 +36,7 @@ extern "C" int _putenv(const char*);
#ifdef __APPLE__
#include <cerrno>
#endif
+#include "foreach.hpp"
#define DBG_G LOG_STREAM(debug, lg::general)
#define LOG_G LOG_STREAM(info, lg::general)
diff --git a/wesnoth/src/log.cpp b/wesnoth/src/log.cpp
index bd219a5..efa7d15 100644
--- a/wesnoth/src/log.cpp
+++ b/wesnoth/src/log.cpp
@@ -24,11 +24,11 @@
#include "SDL.h"
#include "log.hpp"
-#include "foreach.hpp"
#include <map>
#include <sstream>
#include <ctime>
+#include "foreach.hpp"
namespace {
diff --git a/wesnoth/src/map_label.cpp b/wesnoth/src/map_label.cpp
index d53e2e0..2ce6342 100644
--- a/wesnoth/src/map_label.cpp
+++ b/wesnoth/src/map_label.cpp
@@ -15,11 +15,11 @@
#include "global.hpp"
#include "display.hpp"
-#include "foreach.hpp"
#include "gamestatus.hpp"
#include "map_label.hpp"
#include "resources.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
namespace {
diff --git a/wesnoth/src/mapgen.cpp b/wesnoth/src/mapgen.cpp
index 7207cb1..a0488e0 100644
--- a/wesnoth/src/mapgen.cpp
+++ b/wesnoth/src/mapgen.cpp
@@ -19,7 +19,6 @@
#include "global.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "language.hpp"
#include "log.hpp"
@@ -30,6 +29,7 @@
#include "race.hpp"
#include "wml_exception.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
diff --git a/wesnoth/src/menu_events.cpp b/wesnoth/src/menu_events.cpp
index 2b965f6..2067d29 100644
--- a/wesnoth/src/menu_events.cpp
+++ b/wesnoth/src/menu_events.cpp
@@ -25,7 +25,6 @@
#include "dialogs.hpp"
#include "formatter.hpp"
#include "filechooser.hpp"
-#include "foreach.hpp"
#include "game_end_exceptions.hpp"
#include "game_events.hpp"
#include "gettext.hpp"
@@ -58,6 +57,7 @@
#include "widgets/combo.hpp"
#include <boost/bind.hpp>
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
diff --git a/wesnoth/src/mouse_events.cpp b/wesnoth/src/mouse_events.cpp
index 0747859..12115ac 100644
--- a/wesnoth/src/mouse_events.cpp
+++ b/wesnoth/src/mouse_events.cpp
@@ -19,7 +19,6 @@
#include "attack_prediction_display.hpp"
#include "dialogs.hpp"
-#include "foreach.hpp"
#include "game_end_exceptions.hpp"
#include "game_events.hpp"
#include "gettext.hpp"
@@ -36,6 +35,7 @@
#include "wml_separators.hpp"
#include <boost/bind.hpp>
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
diff --git a/wesnoth/src/multiplayer_connect.cpp b/wesnoth/src/multiplayer_connect.cpp
index cbac3b8..17c0b2a 100644
--- a/wesnoth/src/multiplayer_connect.cpp
+++ b/wesnoth/src/multiplayer_connect.cpp
@@ -22,7 +22,6 @@
#include "ai/configuration.hpp"
#include "dialogs.hpp"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "gettext.hpp"
#include "log.hpp"
@@ -34,6 +33,7 @@
#include "wml_separators.hpp"
#include "formula_string_utils.hpp"
#include "tod_manager.hpp"
+#include "foreach.hpp"
#include <boost/bind.hpp>
diff --git a/wesnoth/src/multiplayer_create.cpp b/wesnoth/src/multiplayer_create.cpp
index ed74888..7c1b3bb 100644
--- a/wesnoth/src/multiplayer_create.cpp
+++ b/wesnoth/src/multiplayer_create.cpp
@@ -19,7 +19,6 @@
#include "global.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "game_display.hpp"
#include "construct_dialog.hpp"
@@ -36,6 +35,7 @@
#include "wml_exception.hpp"
#include "wml_separators.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
diff --git a/wesnoth/src/multiplayer_lobby.cpp b/wesnoth/src/multiplayer_lobby.cpp
index 5eed95e..553c150 100644
--- a/wesnoth/src/multiplayer_lobby.cpp
+++ b/wesnoth/src/multiplayer_lobby.cpp
@@ -19,7 +19,6 @@
#include "global.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "lobby_preferences.hpp"
#include "map_exception.hpp"
#include "marked-up_text.hpp"
@@ -31,6 +30,7 @@
#include "sound.hpp"
#include "wml_exception.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
diff --git a/wesnoth/src/multiplayer_ui.cpp b/wesnoth/src/multiplayer_ui.cpp
index ea7f77b..ccb1d4c 100644
--- a/wesnoth/src/multiplayer_ui.cpp
+++ b/wesnoth/src/multiplayer_ui.cpp
@@ -15,7 +15,6 @@
#include "global.hpp"
#include "construct_dialog.hpp"
-#include "foreach.hpp"
#include "gamestatus.hpp"
#include "game_display.hpp"
#include "gettext.hpp"
@@ -30,6 +29,7 @@
#include "replay.hpp"
#include "wml_separators.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define LOG_NG LOG_STREAM(info, log_engine)
diff --git a/wesnoth/src/multiplayer_wait.cpp b/wesnoth/src/multiplayer_wait.cpp
index b005673..e14a267 100644
--- a/wesnoth/src/multiplayer_wait.cpp
+++ b/wesnoth/src/multiplayer_wait.cpp
@@ -15,7 +15,6 @@
#include "global.hpp"
#include "dialogs.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "gui/dialogs/transient_message.hpp"
#include "game_display.hpp"
@@ -26,6 +25,7 @@
#include "statistics.hpp"
#include "wml_separators.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
static lg::log_domain log_network("network");
#define DBG_NW LOG_STREAM(debug, log_network)
diff --git a/wesnoth/src/pathfind/astarsearch.cpp b/wesnoth/src/pathfind/astarsearch.cpp
index b30ec7c..f5494ab 100644
--- a/wesnoth/src/pathfind/astarsearch.cpp
+++ b/wesnoth/src/pathfind/astarsearch.cpp
@@ -18,10 +18,10 @@
#include "log.hpp"
#include "map.hpp"
#include "pathfind/pathfind.hpp"
-#include "foreach.hpp"
#include <queue>
#include <map>
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define LOG_PF LOG_STREAM(info, log_engine)
diff --git a/wesnoth/src/pathfind/pathfind.cpp b/wesnoth/src/pathfind/pathfind.cpp
index 002779e..3aebc94 100644
--- a/wesnoth/src/pathfind/pathfind.cpp
+++ b/wesnoth/src/pathfind/pathfind.cpp
@@ -22,7 +22,6 @@
#include "pathfind/pathfind.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "log.hpp"
#include "map.hpp"
@@ -34,6 +33,7 @@
#include <iostream>
#include <vector>
#include <algorithm>
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define ERR_PF LOG_STREAM(err, log_engine)
diff --git a/wesnoth/src/play_controller.cpp b/wesnoth/src/play_controller.cpp
index fa5dacc..faf0ba8 100644
--- a/wesnoth/src/play_controller.cpp
+++ b/wesnoth/src/play_controller.cpp
@@ -20,7 +20,6 @@
#include "play_controller.hpp"
#include "dialogs.hpp"
-#include "foreach.hpp"
#include "game_events.hpp"
#include "gettext.hpp"
#include "halo.hpp"
@@ -41,6 +40,7 @@
#include "formula_string_utils.hpp"
#include "ai/manager.hpp"
#include "ai/testing.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define LOG_NG LOG_STREAM(info, log_engine)
diff --git a/wesnoth/src/playcampaign.cpp b/wesnoth/src/playcampaign.cpp
index 36051e3..31584ea 100644
--- a/wesnoth/src/playcampaign.cpp
+++ b/wesnoth/src/playcampaign.cpp
@@ -20,7 +20,6 @@
#include "global.hpp"
-#include "foreach.hpp"
#include "game_preferences.hpp"
#include "gui/dialogs/message.hpp"
#include "gui/dialogs/transient_message.hpp"
@@ -36,6 +35,7 @@
#include "sound.hpp"
#include "wml_exception.hpp"
#include "formula_string_utils.hpp"
+#include "foreach.hpp"
#define LOG_G LOG_STREAM(info, lg::general)
diff --git a/wesnoth/src/playsingle_controller.cpp b/wesnoth/src/playsingle_controller.cpp
index c918297..331371e 100644
--- a/wesnoth/src/playsingle_controller.cpp
+++ b/wesnoth/src/playsingle_controller.cpp
@@ -26,7 +26,6 @@
#include "ai/game_info.hpp"
#include "ai/testing.hpp"
#include "dialogs.hpp"
-#include "foreach.hpp"
#include "game_end_exceptions.hpp"
#include "game_events.hpp"
#include "game_preferences.hpp"
@@ -44,6 +43,7 @@
#include "save_blocker.hpp"
#include "soundsource.hpp"
#include "storyscreen/interface.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
diff --git a/wesnoth/src/playturn.cpp b/wesnoth/src/playturn.cpp
index 0c14079..1be3752 100644
--- a/wesnoth/src/playturn.cpp
+++ b/wesnoth/src/playturn.cpp
@@ -15,7 +15,6 @@
#include "playturn.hpp"
#include "construct_dialog.hpp"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "game_end_exceptions.hpp"
#include "game_preferences.hpp"
@@ -29,6 +28,7 @@
#include "play_controller.hpp"
#include <ctime>
+#include "foreach.hpp"
static lg::log_domain log_network("network");
#define ERR_NW LOG_STREAM(err, log_network)
diff --git a/wesnoth/src/replay.cpp b/wesnoth/src/replay.cpp
index 5366e2b..518acfe 100644
--- a/wesnoth/src/replay.cpp
+++ b/wesnoth/src/replay.cpp
@@ -22,7 +22,6 @@
#include "global.hpp"
#include "dialogs.hpp"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "game_end_exceptions.hpp"
#include "game_events.hpp"
@@ -39,6 +38,7 @@
#include "wesconfig.h"
#include <boost/bind.hpp>
+#include "foreach.hpp"
static lg::log_domain log_replay("replay");
#define DBG_REPLAY LOG_STREAM(debug, log_replay)
diff --git a/wesnoth/src/savegame.cpp b/wesnoth/src/savegame.cpp
index 5137550..0c303ea 100644
--- a/wesnoth/src/savegame.cpp
+++ b/wesnoth/src/savegame.cpp
@@ -16,7 +16,6 @@
#include "savegame.hpp"
#include "dialogs.hpp" //FIXME: get rid of this as soon as the two remaining dialogs are moved to gui2
-#include "foreach.hpp"
#include "game_display.hpp"
#include "game_end_exceptions.hpp"
#include "game_preferences.hpp"
@@ -37,6 +36,7 @@
//#include "unit.hpp"
#include "unit_id.hpp"
#include "version.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define LOG_SAVE LOG_STREAM(info, log_engine)
diff --git a/wesnoth/src/scripting/lua.cpp b/wesnoth/src/scripting/lua.cpp
index 9afed0f..d9a8e21 100644
--- a/wesnoth/src/scripting/lua.cpp
+++ b/wesnoth/src/scripting/lua.cpp
@@ -43,7 +43,6 @@ extern "C" {
#include "actions.hpp"
#include "attack_prediction.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "gamestatus.hpp"
#include "log.hpp"
@@ -55,6 +54,7 @@ extern "C" {
#include "unit.hpp"
#include "ai/actions.hpp"
#include "ai/composite/engine_lua.hpp"
+#include "foreach.hpp"
static lg::log_domain log_scripting_lua("scripting/lua");
#define LOG_LUA LOG_STREAM(info, log_scripting_lua)
diff --git a/wesnoth/src/serialization/binary_wml.cpp b/wesnoth/src/serialization/binary_wml.cpp
index 2f2671c..c6ee775 100644
--- a/wesnoth/src/serialization/binary_wml.cpp
+++ b/wesnoth/src/serialization/binary_wml.cpp
@@ -21,10 +21,10 @@
#include "global.hpp"
#include "config.hpp"
-#include "foreach.hpp"
#include "loadscreen.hpp"
#include "log.hpp"
#include "serialization/binary_wml.hpp"
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
diff --git a/wesnoth/src/serialization/parser.cpp b/wesnoth/src/serialization/parser.cpp
index 088df12..b43e929 100644
--- a/wesnoth/src/serialization/parser.cpp
+++ b/wesnoth/src/serialization/parser.cpp
@@ -30,13 +30,13 @@
#include "serialization/preprocessor.hpp"
#include "serialization/tokenizer.hpp"
#include "serialization/string_utils.hpp"
-#include "foreach.hpp"
#include <stack>
#include <boost/iostreams/filtering_stream.hpp>
#include <boost/iostreams/filter/gzip.hpp>
#include <boost/algorithm/string/replace.hpp>
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
diff --git a/wesnoth/src/serialization/preprocessor.cpp b/wesnoth/src/serialization/preprocessor.cpp
index 804e33d..298893a 100644
--- a/wesnoth/src/serialization/preprocessor.cpp
+++ b/wesnoth/src/serialization/preprocessor.cpp
@@ -22,12 +22,12 @@
#include "config.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "wesconfig.h"
#include "serialization/binary_or_text.hpp"
#include "serialization/string_utils.hpp"
#include "util.hpp"
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
diff --git a/wesnoth/src/server/ban.cpp b/wesnoth/src/server/ban.cpp
index 84462b6..bbd47d0 100644
--- a/wesnoth/src/server/ban.cpp
+++ b/wesnoth/src/server/ban.cpp
@@ -13,7 +13,6 @@
*/
#include "config.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "filesystem.hpp"
#include "serialization/parser.hpp"
@@ -25,6 +24,7 @@
#include <boost/bind.hpp>
+#include "foreach.hpp"
namespace wesnothd {
diff --git a/wesnoth/src/server/room_manager.cpp b/wesnoth/src/server/room_manager.cpp
index 41ca73b..0206d83 100644
--- a/wesnoth/src/server/room_manager.cpp
+++ b/wesnoth/src/server/room_manager.cpp
@@ -20,8 +20,8 @@
#include "../serialization/string_utils.hpp"
#include "../util.hpp"
#include "../filesystem.hpp"
-#include "../foreach.hpp"
#include "../log.hpp"
+#include "../foreach.hpp"
static lg::log_domain log_server_lobby("server/lobby");
#define ERR_LOBBY LOG_STREAM(err, log_server_lobby)
diff --git a/wesnoth/src/server/server.cpp b/wesnoth/src/server/server.cpp
index 7b6eb60..88a18b3 100644
--- a/wesnoth/src/server/server.cpp
+++ b/wesnoth/src/server/server.cpp
@@ -22,7 +22,6 @@
#include "../global.hpp"
#include "../config.hpp"
-#include "../foreach.hpp"
#include "../game_config.hpp"
#include "../log.hpp"
#include "../map.hpp" // gamemap::MAX_PLAYERS
@@ -71,6 +70,7 @@
#ifndef _WIN32
#include <sys/times.h>
+#include "../foreach.hpp"
namespace {
diff --git a/wesnoth/src/sound.cpp b/wesnoth/src/sound.cpp
index a032d59..a0b1f9f 100644
--- a/wesnoth/src/sound.cpp
+++ b/wesnoth/src/sound.cpp
@@ -14,7 +14,6 @@
#include "global.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "game_preferences.hpp"
#include "log.hpp"
#include "serialization/string_utils.hpp"
@@ -25,6 +24,7 @@
#include "SDL_mixer.h"
#include <list>
+#include "foreach.hpp"
static lg::log_domain log_audio("audio");
#define LOG_AUDIO LOG_STREAM(info, log_audio)
diff --git a/wesnoth/src/soundsource.cpp b/wesnoth/src/soundsource.cpp
index de5475d..53f9c6a 100644
--- a/wesnoth/src/soundsource.cpp
+++ b/wesnoth/src/soundsource.cpp
@@ -16,11 +16,11 @@
#include "display.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "serialization/string_utils.hpp"
#include "sound.hpp"
#include "soundsource.hpp"
+#include "foreach.hpp"
namespace soundsource {
diff --git a/wesnoth/src/statistics.cpp b/wesnoth/src/statistics.cpp
index 0a2ac05..900fe6d 100644
--- a/wesnoth/src/statistics.cpp
+++ b/wesnoth/src/statistics.cpp
@@ -19,11 +19,11 @@
#include "global.hpp"
#include "statistics.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "serialization/binary_or_text.hpp"
#include "unit.hpp"
#include "util.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define DBG_NG LOG_STREAM(debug, log_engine)
diff --git a/wesnoth/src/storyscreen/controller.cpp b/wesnoth/src/storyscreen/controller.cpp
index 0f48e55..7184d42 100644
--- a/wesnoth/src/storyscreen/controller.cpp
+++ b/wesnoth/src/storyscreen/controller.cpp
@@ -24,7 +24,6 @@
#include "storyscreen/render.hpp"
#include "asserts.hpp"
-#include "foreach.hpp"
#include "variable.hpp"
#include "display.hpp"
@@ -35,6 +34,7 @@
#include "log.hpp"
#include "resources.hpp"
#include "widgets/button.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
diff --git a/wesnoth/src/storyscreen/interface.cpp b/wesnoth/src/storyscreen/interface.cpp
index 18c6385..fddb0d1 100644
--- a/wesnoth/src/storyscreen/interface.cpp
+++ b/wesnoth/src/storyscreen/interface.cpp
@@ -18,7 +18,6 @@
*/
#include "global.hpp"
-#include "foreach.hpp"
#include "variable.hpp"
#include "storyscreen/interface.hpp"
@@ -38,6 +37,7 @@ static lg::log_domain log_engine("engine");
// TODO: remove when completed
#include "stub.hpp"
+#include "foreach.hpp"
namespace {
void generate_endscreen_part_config(config& append_to_cfg)
diff --git a/wesnoth/src/storyscreen/part.cpp b/wesnoth/src/storyscreen/part.cpp
index fb65f70..5dcfa3e 100644
--- a/wesnoth/src/storyscreen/part.cpp
+++ b/wesnoth/src/storyscreen/part.cpp
@@ -19,7 +19,6 @@
#include "global.hpp"
#include "asserts.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "resources.hpp"
#include "storyscreen/part.hpp"
@@ -32,6 +31,7 @@
#include "util.hpp"
#include "variable.hpp"
#include "video.hpp"
+#include "foreach.hpp"
namespace storyscreen {
diff --git a/wesnoth/src/storyscreen/render.cpp b/wesnoth/src/storyscreen/render.cpp
index 8259523..0ded967 100644
--- a/wesnoth/src/storyscreen/render.cpp
+++ b/wesnoth/src/storyscreen/render.cpp
@@ -21,7 +21,6 @@
#include "global.hpp"
#include "asserts.hpp"
-#include "foreach.hpp"
#include "log.hpp"
#include "storyscreen/part.hpp"
#include "storyscreen/render.hpp"
@@ -32,6 +31,7 @@
#include "sound.hpp"
#include "text.hpp"
#include "video.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
diff --git a/wesnoth/src/team.cpp b/wesnoth/src/team.cpp
index 84dc112..1957701 100644
--- a/wesnoth/src/team.cpp
+++ b/wesnoth/src/team.cpp
@@ -20,13 +20,13 @@
#include "global.hpp"
#include "ai/manager.hpp"
-#include "foreach.hpp"
#include "game_events.hpp"
#include "gamestatus.hpp"
#include "log.hpp"
#include "map.hpp"
#include "resources.hpp"
#include "team.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define DBG_NG LOG_STREAM(debug, log_engine)
diff --git a/wesnoth/src/terrain.cpp b/wesnoth/src/terrain.cpp
index 9978768..966a562 100644
--- a/wesnoth/src/terrain.cpp
+++ b/wesnoth/src/terrain.cpp
@@ -14,7 +14,6 @@
#include "global.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "log.hpp"
#include "serialization/string_utils.hpp"
@@ -22,6 +21,7 @@
#include "util.hpp"
#include <set>
+#include "foreach.hpp"
static lg::log_domain log_config("config");
#define ERR_CF LOG_STREAM(err, log_config)
diff --git a/wesnoth/src/tests/gui/test_gui2.cpp b/wesnoth/src/tests/gui/test_gui2.cpp
index 774f1c5..784264a 100644
--- a/wesnoth/src/tests/gui/test_gui2.cpp
+++ b/wesnoth/src/tests/gui/test_gui2.cpp
@@ -19,7 +19,6 @@
#include "config_cache.hpp"
#include "filesystem.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "game_config.hpp"
#include "game_display.hpp"
@@ -53,6 +52,7 @@
#include <boost/bind.hpp>
#include <memory>
+#include "foreach.hpp"
namespace {
diff --git a/wesnoth/src/theme.cpp b/wesnoth/src/theme.cpp
index 28a286a..931602c 100644
--- a/wesnoth/src/theme.cpp
+++ b/wesnoth/src/theme.cpp
@@ -17,7 +17,6 @@
#include "global.hpp"
#include "font.hpp"
-#include "foreach.hpp"
#include "gettext.hpp"
#include "hotkeys.hpp"
#include "log.hpp"
@@ -25,6 +24,7 @@
#include "theme.hpp"
#include "wml_exception.hpp"
+#include "foreach.hpp"
static lg::log_domain log_display("display");
#define DBG_DP LOG_STREAM(debug, log_display)
diff --git a/wesnoth/src/time_of_day.cpp b/wesnoth/src/time_of_day.cpp
index e5ec9c4..4c28bb4 100644
--- a/wesnoth/src/time_of_day.cpp
+++ b/wesnoth/src/time_of_day.cpp
@@ -16,10 +16,10 @@
#include "global.hpp"
-#include "foreach.hpp"
#include "time_of_day.hpp"
#include <cstdio>
+#include "foreach.hpp"
time_of_day::time_of_day(const config& cfg)
: lawful_bonus(atoi(cfg["lawful_bonus"].c_str())),
diff --git a/wesnoth/src/titlescreen.cpp b/wesnoth/src/titlescreen.cpp
index 9c1da84..aed502c 100644
--- a/wesnoth/src/titlescreen.cpp
+++ b/wesnoth/src/titlescreen.cpp
@@ -29,7 +29,6 @@
#include "config.hpp"
#include "construct_dialog.hpp"
#include "cursor.hpp"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "game_preferences.hpp"
#include "events.hpp"
@@ -48,6 +47,7 @@
#include "video.hpp"
#include "serialization/parser.hpp"
#include "serialization/preprocessor.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
diff --git a/wesnoth/src/tod_manager.cpp b/wesnoth/src/tod_manager.cpp
index 6e64792..85f17c4 100644
--- a/wesnoth/src/tod_manager.cpp
+++ b/wesnoth/src/tod_manager.cpp
@@ -11,7 +11,6 @@
See the COPYING file for more details.
*/
-#include "foreach.hpp"
#include "tod_manager.hpp"
#include "wml_exception.hpp"
#include "gettext.hpp"
@@ -21,6 +20,7 @@
#include "map.hpp"
#include "unit.hpp"
#include "unit_abilities.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define LOG_NG LOG_STREAM(info, log_engine)
diff --git a/wesnoth/src/unit.cpp b/wesnoth/src/unit.cpp
index 63035a4..486383a 100644
--- a/wesnoth/src/unit.cpp
+++ b/wesnoth/src/unit.cpp
@@ -23,7 +23,6 @@
#include "actions.hpp"
#include "callable_objects.hpp"
-#include "foreach.hpp"
#include "formula.hpp"
#include "game_display.hpp"
#include "game_events.hpp"
@@ -39,6 +38,7 @@
#include "formula_string_utils.hpp"
#include "team.hpp"
#include "scripting/lua.hpp"
+#include "foreach.hpp"
static lg::log_domain log_unit("unit");
#define DBG_UT LOG_STREAM(debug, log_unit)
diff --git a/wesnoth/src/unit_abilities.cpp b/wesnoth/src/unit_abilities.cpp
index 47a604b..2d28ee0 100644
--- a/wesnoth/src/unit_abilities.cpp
+++ b/wesnoth/src/unit_abilities.cpp
@@ -17,12 +17,12 @@
* Manage unit-abilities, like heal, cure, and weapon_specials.
*/
-#include "foreach.hpp"
#include "gamestatus.hpp"
#include "resources.hpp"
#include "terrain_filter.hpp"
#include "unit.hpp"
#include "unit_abilities.hpp"
+#include "foreach.hpp"
diff --git a/wesnoth/src/unit_animation.cpp b/wesnoth/src/unit_animation.cpp
index 3ddf487..f4647b6 100644
--- a/wesnoth/src/unit_animation.cpp
+++ b/wesnoth/src/unit_animation.cpp
@@ -16,7 +16,6 @@
#include "unit_animation.hpp"
-#include "foreach.hpp"
#include "game_display.hpp"
#include "halo.hpp"
#include "map.hpp"
@@ -26,6 +25,7 @@
#include "play_controller.hpp"
#include <algorithm>
+#include "foreach.hpp"
struct tag_name_manager {
tag_name_manager() : names() {
diff --git a/wesnoth/src/unit_types.cpp b/wesnoth/src/unit_types.cpp
index fbff192..79a2c4b 100644
--- a/wesnoth/src/unit_types.cpp
+++ b/wesnoth/src/unit_types.cpp
@@ -22,12 +22,12 @@
#include "unit_types.hpp"
#include "asserts.hpp"
-#include "foreach.hpp"
#include "game_config.hpp"
#include "gettext.hpp"
#include "loadscreen.hpp"
#include "log.hpp"
#include "map.hpp"
+#include "foreach.hpp"
static lg::log_domain log_config("config");
diff --git a/wesnoth/src/variable.cpp b/wesnoth/src/variable.cpp
index 7ece370..c3f12d4 100644
--- a/wesnoth/src/variable.cpp
+++ b/wesnoth/src/variable.cpp
@@ -23,7 +23,6 @@
#include "variable.hpp"
-#include "foreach.hpp"
#include "formula_string_utils.hpp"
#include "gamestatus.hpp"
#include "log.hpp"
@@ -31,6 +30,7 @@
#include "unit.hpp"
#include "unit_map.hpp"
#include "team.hpp"
+#include "foreach.hpp"
static lg::log_domain log_engine("engine");
#define LOG_NG LOG_STREAM(info, log_engine)
diff --git a/wesnoth/src/video.cpp b/wesnoth/src/video.cpp
index f84e547..b089e6c 100644
--- a/wesnoth/src/video.cpp
+++ b/wesnoth/src/video.cpp
@@ -20,7 +20,6 @@
#include "global.hpp"
#include "font.hpp"
-#include "foreach.hpp"
#include "image.hpp"
#include "log.hpp"
#include "preferences_display.hpp"
@@ -29,6 +28,7 @@
#include <vector>
#include <map>
#include <algorithm>
+#include "foreach.hpp"
static lg::log_domain log_display("display");
#define LOG_DP LOG_STREAM(info, log_display)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-02 15:10 ` Ivan A. Melnikov
@ 2011-12-02 15:16 ` Sergey V Turchin
2011-12-02 15:48 ` Sergey V Turchin
0 siblings, 1 reply; 14+ messages in thread
From: Sergey V Turchin @ 2011-12-02 15:16 UTC (permalink / raw)
To: ALT Linux Team development discussions
[-- Attachment #1: Type: text/plain, Size: 1043 bytes --]
On 2 декабря 2011 19:10:45 Ivan A. Melnikov wrote:
> On Fri, 2 Dec 2011 10:36:37 +0400
>
> "Ivan A. Melnikov" <iv@altlinux.org> wrote:
> > Здравствуйте.
> >
> > В Сизиф собран очередной свежий boost, на этот раз 1.48.0.
>
> > Из замеченых проблем:
> Ещё у нас теперь воспроизводится
>
> https://bugreports.qt.nokia.com/browse/QTBUG-22829
>
> (по результатам пересборки пострадало 5 пакетов).
В качестве временного решения у того, что не собирается, можно попробовать
завернуть питоньи заголовки в
#ifndef Q_MOC_RUN
#include <boost/чтото.hpp>
#endif
> Я думаю сделать для этого workaround в самом boost, но успею не раньше
> понедельника, и не уверен, что получится.
--
Regards, Sergey. ALT Linux, http://www.altlinux.ru/
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-02 15:16 ` Sergey V Turchin
@ 2011-12-02 15:48 ` Sergey V Turchin
0 siblings, 0 replies; 14+ messages in thread
From: Sergey V Turchin @ 2011-12-02 15:48 UTC (permalink / raw)
To: ALT Linux Team development discussions
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
On 2 декабря 2011 19:16:50 Sergey V Turchin wrote:
[...]
> питоньи
Ой, boost-овские :-)
--
Regards, Sergey. ALT Linux, http://www.altlinux.ru/
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
@ 2011-12-02 18:04 ` Dmitry V. Levin
2011-12-02 18:06 ` Радик Юсупов
2011-12-05 7:07 ` Ivan A. Melnikov
1 sibling, 1 reply; 14+ messages in thread
From: Dmitry V. Levin @ 2011-12-02 18:04 UTC (permalink / raw)
To: ALT Devel discussion list
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
On Fri, Dec 02, 2011 at 10:00:19PM +0400, Радик Юсупов wrote:
> 02.12.2011 10:36, Ivan A. Melnikov пишет:
> >Если всплывёт ещё что, обращайтесь,
> >правда на выходных могу оказаться
> >не доступен.
> zarafa сломалась с такой диагностикой:
>
> checking for the Boost date_time library... yes
> checking boost version compatibility... configure: error: boost version is
> too new
> error: Bad exit status from /usr/src/tmp/rpm-tmp.69408 (%build)
>
> не знаю как чинить :(
Пожалуйтесь апстриму. :)
--
ldv
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-02 18:04 ` Dmitry V. Levin
@ 2011-12-02 18:06 ` Радик Юсупов
0 siblings, 0 replies; 14+ messages in thread
From: Радик Юсупов @ 2011-12-02 18:06 UTC (permalink / raw)
To: devel
02.12.2011 22:04, Dmitry V. Levin пишет:
> Пожалуйтесь апстриму.:)
Спасибо..
--
ALTLinux Team
My project: http://lxdesktop.altlinux.org
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-02 9:29 ` Ivan A. Melnikov
2011-12-02 14:00 ` Vitaly Kuznetsov
@ 2011-12-04 15:43 ` Motsyo Gennadi aka Drool
2011-12-05 6:06 ` REAL
2 siblings, 0 replies; 14+ messages in thread
From: Motsyo Gennadi aka Drool @ 2011-12-04 15:43 UTC (permalink / raw)
To: ALT Linux Team development discussions
02.12.2011 11:29, Ivan A. Melnikov пишет:
> flush drool @everybody
< flush add iv
> OK: flush: drool @everybody iv
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-02 9:29 ` Ivan A. Melnikov
2011-12-02 14:00 ` Vitaly Kuznetsov
2011-12-04 15:43 ` Motsyo Gennadi aka Drool
@ 2011-12-05 6:06 ` REAL
2 siblings, 0 replies; 14+ messages in thread
From: REAL @ 2011-12-05 6:06 UTC (permalink / raw)
To: ALT Linux Team development discussions
02.12.2011 15:29, Ivan A. Melnikov пишет:
>> Также прошу сообщество по мере возможности пересобрать зависящие от
>> boost 1.47.0 пакеты, чтобы можно было удалить традиционный
>> compat-пакет boost1_47_0.
[...]
> libtorrent-rasterbar0.15 swi
Вот этот пакет традиционно мешает обновлять другие пакеты. Может быть,
на него ACL хотя бы для @qa выдать?
--
REAL aka Евгений Ростовцев, программист ЦНИТ КемГУ
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-02 18:04 ` Dmitry V. Levin
@ 2011-12-05 7:07 ` Ivan A. Melnikov
2011-12-05 8:16 ` REAL
1 sibling, 1 reply; 14+ messages in thread
From: Ivan A. Melnikov @ 2011-12-05 7:07 UTC (permalink / raw)
To: devel
[-- Attachment #1: Type: text/plain, Size: 1191 bytes --]
On Fri, 02 Dec 2011 22:00:19 +0400
Радик Юсупов <radyus@yandex.ru> wrote:
> 02.12.2011 10:36, Ivan A. Melnikov пишет:
> > Если всплывёт ещё что, обращайтесь, правда на выходных могу
> > оказаться не доступен.
> zarafa сломалась с такой диагностикой:
>
> checking for the Boost date_time library... yes
> checking boost version compatibility... configure: error: boost
> version is too new error: Bad exit status
> from /usr/src/tmp/rpm-tmp.69408 (%build)
>
> не знаю как чинить :(
>
Прошу прощения за небыстрый ответ, в выходные внезапно оказался
отрезан от почты...
Из boost 1.48.0 пока не выкинули Boost.Filesystem v2. Видимо,
вопреки ожиданиям разработчиков zarafa.
Так что достаточно закомментировать 3 строчки в configure.ac или
поправить одну (как я это сделал в аттаче), и всё соберётся.
--
WBR,
Ivan A. Melnikov
[-- Attachment #2: zafara-7.0.3-alt-allow-newer-boost.patch --]
[-- Type: text/x-patch, Size: 527 bytes --]
diff --git a/zarafa/configure.ac b/zarafa/configure.ac
index f50b2b4..4425ccc 100644
--- a/zarafa/configure.ac
+++ b/zarafa/configure.ac
@@ -657,7 +657,7 @@ BOOST_FILESYSTEM([mt])
BOOST_DATE_TIME([mt])
AC_MSG_CHECKING([boost version compatibility])
if test -n "$boost_major_version" -a $boost_major_version -ge 146; then
- if test $boost_major_version -ge 148; then
+ if test $boost_major_version -ge 149; then
AC_MSG_ERROR([boost version is too new])
fi
AC_MSG_RESULT([adding backward compatible flags])
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-05 7:07 ` Ivan A. Melnikov
@ 2011-12-05 8:16 ` REAL
2011-12-07 2:19 ` Радик Юсупов
0 siblings, 1 reply; 14+ messages in thread
From: REAL @ 2011-12-05 8:16 UTC (permalink / raw)
To: ALT Linux Team development discussions
05.12.2011 13:07, Ivan A. Melnikov пишет:
>> zarafa сломалась с такой диагностикой:
>>
>> checking for the Boost date_time library... yes
>> checking boost version compatibility... configure: error: boost
>> version is too new error: Bad exit status
>> from /usr/src/tmp/rpm-tmp.69408 (%build)
>>
[..]
> Так что достаточно закомментировать 3 строчки в configure.ac или
> поправить одну (как я это сделал в аттаче), и всё соберётся.
Я эту одну поправил чуть по-другому (и уже отправил на сборку):
- if test $boost_major_version -ge 148; then
+ if test $boost_major_version -gt 148; then
--
REAL aka Евгений Ростовцев, программист ЦНИТ КемГУ
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [devel] I: boost 1.48.0
2011-12-05 8:16 ` REAL
@ 2011-12-07 2:19 ` Радик Юсупов
0 siblings, 0 replies; 14+ messages in thread
From: Радик Юсупов @ 2011-12-07 2:19 UTC (permalink / raw)
To: devel
05.12.2011 12:16, REAL пишет:
> 05.12.2011 13:07, Ivan A. Melnikov пишет:
>>> zarafa сломалась с такой диагностикой:
>>>
>>> checking for the Boost date_time library... yes
>>> checking boost version compatibility... configure: error: boost
>>> version is too new error: Bad exit status
>>> from /usr/src/tmp/rpm-tmp.69408 (%build)
>>>
> [..]
>> Так что достаточно закомментировать 3 строчки в configure.ac или
>> поправить одну (как я это сделал в аттаче), и всё соберётся.
>
> Я эту одну поправил чуть по-другому (и уже отправил на сборку):
>
> - if test $boost_major_version -ge 148; then
> + if test $boost_major_version -gt 148; then
>
Спасибо!
:)
--
ALTLinux Team
My project: http://lxdesktop.altlinux.org
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2011-12-07 2:19 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-02 6:36 [devel] I: boost 1.48.0 Ivan A. Melnikov
2011-12-02 9:29 ` Ivan A. Melnikov
2011-12-02 14:00 ` Vitaly Kuznetsov
2011-12-02 15:11 ` Ivan A. Melnikov
2011-12-04 15:43 ` Motsyo Gennadi aka Drool
2011-12-05 6:06 ` REAL
2011-12-02 15:10 ` Ivan A. Melnikov
2011-12-02 15:16 ` Sergey V Turchin
2011-12-02 15:48 ` Sergey V Turchin
2011-12-02 18:04 ` Dmitry V. Levin
2011-12-02 18:06 ` Радик Юсупов
2011-12-05 7:07 ` Ivan A. Melnikov
2011-12-05 8:16 ` REAL
2011-12-07 2:19 ` Радик Юсупов
ALT Linux Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git