From ae39fe4e8acf4e5f199a106f877e83a4aae86869 Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Sun, 29 Jun 2014 11:07:25 -0400 Subject: [PATCH 1/2] Revert "put include guards on boost/function" This reverts commit 8f0fe88635c0a06969b7f49b13e4fb74b066b317. --- src/ai/composite/ai.cpp | 5 ----- src/ai/composite/property_handler.hpp | 5 ----- src/ana/src/asio_server.hpp | 5 ----- src/campaign_server/campaign_server.hpp | 5 ----- src/display.hpp | 5 ----- src/gui/auxiliary/event/dispatcher.hpp | 5 ----- src/gui/auxiliary/timer.hpp | 5 ----- src/gui/auxiliary/window_builder.hpp | 5 ----- src/gui/dialogs/dialog.hpp | 5 ----- src/gui/widgets/pane.hpp | 5 ----- src/gui/widgets/scrollbar.hpp | 5 ----- src/gui/widgets/selectable.hpp | 5 ----- src/gui/widgets/settings.hpp | 5 ----- src/gui/widgets/text.hpp | 5 ----- src/gui/widgets/window.hpp | 5 ----- src/playturn_network_adapter.hpp | 5 ----- src/random_new_synced.hpp | 5 ----- src/server/player_network.hpp | 5 ----- src/server/server.hpp | 5 ----- src/synced_commands.hpp | 5 ----- src/synced_context.hpp | 5 ----- src/tests/test_sdl_utils.hpp | 5 ----- src/wesmage/filter.cpp | 5 ----- src/whiteboard/utility.hpp | 5 ----- 24 files changed, 120 deletions(-) diff --git a/src/ai/composite/ai.cpp b/src/ai/composite/ai.cpp index 683639d6116d..b48652664fba 100644 --- a/src/ai/composite/ai.cpp +++ b/src/ai/composite/ai.cpp @@ -29,12 +29,7 @@ #include "../../log.hpp" #include - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include namespace ai { diff --git a/src/ai/composite/property_handler.hpp b/src/ai/composite/property_handler.hpp index b6f9254f5999..d221b03c7206 100644 --- a/src/ai/composite/property_handler.hpp +++ b/src/ai/composite/property_handler.hpp @@ -21,12 +21,7 @@ #ifndef AI_COMPOSITE_PROPERTY_HANDLER_HPP_INCLUDED #define AI_COMPOSITE_PROPERTY_HANDLER_HPP_INCLUDED - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include #include "config.hpp" diff --git a/src/ana/src/asio_server.hpp b/src/ana/src/asio_server.hpp index 564969269f6f..d3a638ce2b33 100644 --- a/src/ana/src/asio_server.hpp +++ b/src/ana/src/asio_server.hpp @@ -36,12 +36,7 @@ #include #include - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include "../api/ana.hpp" #include "asio_listener.hpp" diff --git a/src/campaign_server/campaign_server.hpp b/src/campaign_server/campaign_server.hpp index 31c3702cc231..f88d3850992e 100644 --- a/src/campaign_server/campaign_server.hpp +++ b/src/campaign_server/campaign_server.hpp @@ -19,12 +19,7 @@ #include "network.hpp" #include "server/input_stream.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include #include diff --git a/src/display.hpp b/src/display.hpp index 7c97e8b64c77..44d1b1e92fc4 100644 --- a/src/display.hpp +++ b/src/display.hpp @@ -62,12 +62,7 @@ namespace wb { #include "overlay.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include #include #include diff --git a/src/gui/auxiliary/event/dispatcher.hpp b/src/gui/auxiliary/event/dispatcher.hpp index f5124834cde8..6d947d538b19 100644 --- a/src/gui/auxiliary/event/dispatcher.hpp +++ b/src/gui/auxiliary/event/dispatcher.hpp @@ -22,12 +22,7 @@ #include "SDL_events.h" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include #include diff --git a/src/gui/auxiliary/timer.hpp b/src/gui/auxiliary/timer.hpp index b49e61846880..9dbddc148bef 100644 --- a/src/gui/auxiliary/timer.hpp +++ b/src/gui/auxiliary/timer.hpp @@ -30,12 +30,7 @@ #ifndef GUI_WIDGETS_AUXILIARY_TIMER_HPP_INCLUDED #define GUI_WIDGETS_AUXILIARY_TIMER_HPP_INCLUDED - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include diff --git a/src/gui/auxiliary/window_builder.hpp b/src/gui/auxiliary/window_builder.hpp index 061568337030..ec48551354e3 100644 --- a/src/gui/auxiliary/window_builder.hpp +++ b/src/gui/auxiliary/window_builder.hpp @@ -19,12 +19,7 @@ #include "gui/widgets/grid.hpp" #include "reference_counted_object.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - class config; class CVideo; diff --git a/src/gui/dialogs/dialog.hpp b/src/gui/dialogs/dialog.hpp index b91877a40c25..326bbe8ef0ab 100644 --- a/src/gui/dialogs/dialog.hpp +++ b/src/gui/dialogs/dialog.hpp @@ -17,12 +17,7 @@ #include "gui/dialogs/field-fwd.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include #include diff --git a/src/gui/widgets/pane.hpp b/src/gui/widgets/pane.hpp index 00cd609b9026..c80c6f7bd846 100644 --- a/src/gui/widgets/pane.hpp +++ b/src/gui/widgets/pane.hpp @@ -19,12 +19,7 @@ #include "gui/auxiliary/window_builder.hpp" #include "gui/auxiliary/placer.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include diff --git a/src/gui/widgets/scrollbar.hpp b/src/gui/widgets/scrollbar.hpp index f908fe20ac46..dc72a017edaf 100644 --- a/src/gui/widgets/scrollbar.hpp +++ b/src/gui/widgets/scrollbar.hpp @@ -18,12 +18,7 @@ #include "gui/auxiliary/notifier.hpp" #include "gui/widgets/control.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - namespace gui2 { diff --git a/src/gui/widgets/selectable.hpp b/src/gui/widgets/selectable.hpp index 778d20915662..306445133ba8 100644 --- a/src/gui/widgets/selectable.hpp +++ b/src/gui/widgets/selectable.hpp @@ -15,12 +15,7 @@ #ifndef GUI_WIDGETS_SELECTABLE_HPP_INCLUDED #define GUI_WIDGETS_SELECTABLE_HPP_INCLUDED - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - namespace gui2 { diff --git a/src/gui/widgets/settings.hpp b/src/gui/widgets/settings.hpp index 568715ef4cc3..ac4c7f91c4bb 100644 --- a/src/gui/widgets/settings.hpp +++ b/src/gui/widgets/settings.hpp @@ -24,12 +24,7 @@ #include "utils/foreach.tpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include #include diff --git a/src/gui/widgets/text.hpp b/src/gui/widgets/text.hpp index 0a23fee5a2c6..28390b1a8b27 100644 --- a/src/gui/widgets/text.hpp +++ b/src/gui/widgets/text.hpp @@ -21,12 +21,7 @@ #include - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - namespace gui2 { diff --git a/src/gui/widgets/window.hpp b/src/gui/widgets/window.hpp index ad2665862184..699643a8dc19 100644 --- a/src/gui/widgets/window.hpp +++ b/src/gui/widgets/window.hpp @@ -29,12 +29,7 @@ #include "events.hpp" #include - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - class CVideo; diff --git a/src/playturn_network_adapter.hpp b/src/playturn_network_adapter.hpp index 6ff0d71656d6..be6cbc233b77 100644 --- a/src/playturn_network_adapter.hpp +++ b/src/playturn_network_adapter.hpp @@ -5,12 +5,7 @@ #include "config.hpp" #include - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - /* The purpose if this class is to preprocess incoming network data, and provide a steam that always returns just one command/action at a time. diff --git a/src/random_new_synced.hpp b/src/random_new_synced.hpp index f169b302a6de..d54cb114af02 100644 --- a/src/random_new_synced.hpp +++ b/src/random_new_synced.hpp @@ -20,12 +20,7 @@ #include "random_new.hpp" #include "simple_rng.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - /* diff --git a/src/server/player_network.hpp b/src/server/player_network.hpp index f5a28cc50058..f38bc3c17e2c 100644 --- a/src/server/player_network.hpp +++ b/src/server/player_network.hpp @@ -20,12 +20,7 @@ #include "player.hpp" #include "simple_wml.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - namespace wesnothd { diff --git a/src/server/server.hpp b/src/server/server.hpp index a4c3f3121d6d..46f14e0bbed9 100644 --- a/src/server/server.hpp +++ b/src/server/server.hpp @@ -25,12 +25,7 @@ #include "room_manager.hpp" #include "simple_wml.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include class server diff --git a/src/synced_commands.hpp b/src/synced_commands.hpp index 138237f32ca3..cfb30e672902 100644 --- a/src/synced_commands.hpp +++ b/src/synced_commands.hpp @@ -18,12 +18,7 @@ #include #include "config.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - class synced_command { public: /* diff --git a/src/synced_context.hpp b/src/synced_context.hpp index 81f3c61870b6..1aa7e69a958b 100644 --- a/src/synced_context.hpp +++ b/src/synced_context.hpp @@ -14,12 +14,7 @@ #ifndef SYNCED_CONTEXT_H_INCLUDED #define SYNCED_CONTEXT_H_INCLUDED - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include "synced_commands.hpp" #include "synced_checkup.hpp" #include "replay.hpp" diff --git a/src/tests/test_sdl_utils.hpp b/src/tests/test_sdl_utils.hpp index 108f54788fd0..c3e15b10e41e 100644 --- a/src/tests/test_sdl_utils.hpp +++ b/src/tests/test_sdl_utils.hpp @@ -17,12 +17,7 @@ #include "sdl/utils.hpp" - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - typedef boost::function< void(const surface&, const double, const Uint32)> diff --git a/src/wesmage/filter.cpp b/src/wesmage/filter.cpp index 193b805c0561..6a18decacdb2 100644 --- a/src/wesmage/filter.cpp +++ b/src/wesmage/filter.cpp @@ -19,12 +19,7 @@ #include #include - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include diff --git a/src/whiteboard/utility.hpp b/src/whiteboard/utility.hpp index ff9ce563c0b8..cc8d7f51fd96 100644 --- a/src/whiteboard/utility.hpp +++ b/src/whiteboard/utility.hpp @@ -22,12 +22,7 @@ #include #include - -#ifndef INCL_BOOST_FUNCTION_HPP_ -#define INCL_BOOST_FUNCTION_HPP_ #include -#endif - #include "typedefs.hpp" From 32dc07478f76c2f7c60438685ed2c5c055f27336 Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Sun, 29 Jun 2014 11:40:53 -0400 Subject: [PATCH 2/2] revert and fixup boost/function.hpp external include guards --- projectfiles/CodeBlocks/wesnoth.cbp | 1 + projectfiles/VC9/wesnoth.vcproj | 28 ++++++++++++++----------- src/ai/composite/ai.cpp | 2 +- src/ai/composite/property_handler.hpp | 2 +- src/ana/src/asio_server.hpp | 2 +- src/campaign_server/campaign_server.hpp | 2 +- src/display.hpp | 2 +- src/gui/auxiliary/event/dispatcher.hpp | 2 +- src/gui/auxiliary/timer.hpp | 2 +- src/gui/auxiliary/window_builder.hpp | 2 +- src/gui/dialogs/dialog.hpp | 2 +- src/gui/widgets/pane.hpp | 2 +- src/gui/widgets/scrollbar.hpp | 2 +- src/gui/widgets/selectable.hpp | 2 +- src/gui/widgets/settings.hpp | 2 +- src/gui/widgets/text.hpp | 2 +- src/gui/widgets/window.hpp | 2 +- src/playturn_network_adapter.hpp | 2 +- src/random_new_synced.hpp | 2 +- src/server/player_network.hpp | 2 +- src/server/server.hpp | 2 +- src/synced_commands.hpp | 2 +- src/synced_context.hpp | 2 +- src/tests/test_sdl_utils.hpp | 2 +- src/utils/boost_function_guarded.hpp | 5 +++++ src/wesmage/filter.cpp | 2 +- src/whiteboard/utility.hpp | 2 +- 27 files changed, 46 insertions(+), 36 deletions(-) create mode 100644 src/utils/boost_function_guarded.hpp diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp index 6f8d62b659a8..d56e2a7110e8 100644 --- a/projectfiles/CodeBlocks/wesnoth.cbp +++ b/projectfiles/CodeBlocks/wesnoth.cbp @@ -1054,6 +1054,7 @@ + diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj index d23eee607cf0..b4ec3dffd910 100644 --- a/projectfiles/VC9/wesnoth.vcproj +++ b/projectfiles/VC9/wesnoth.vcproj @@ -16029,6 +16029,10 @@ + + @@ -16037,6 +16041,18 @@ RelativePath="..\..\src\utils\reference_counter.hpp" > + + + + + + @@ -20948,18 +20964,6 @@ RelativePath="..\..\src\settings.hpp" > - - - - - - diff --git a/src/ai/composite/ai.cpp b/src/ai/composite/ai.cpp index b48652664fba..2263ac4b9528 100644 --- a/src/ai/composite/ai.cpp +++ b/src/ai/composite/ai.cpp @@ -29,7 +29,7 @@ #include "../../log.hpp" #include -#include +#include "utils/boost_function_guarded.hpp" #include namespace ai { diff --git a/src/ai/composite/property_handler.hpp b/src/ai/composite/property_handler.hpp index d221b03c7206..7200f83f8ea7 100644 --- a/src/ai/composite/property_handler.hpp +++ b/src/ai/composite/property_handler.hpp @@ -21,7 +21,7 @@ #ifndef AI_COMPOSITE_PROPERTY_HANDLER_HPP_INCLUDED #define AI_COMPOSITE_PROPERTY_HANDLER_HPP_INCLUDED -#include +#include "utils/boost_function_guarded.hpp" #include #include "config.hpp" diff --git a/src/ana/src/asio_server.hpp b/src/ana/src/asio_server.hpp index d3a638ce2b33..b4d96f0d1a30 100644 --- a/src/ana/src/asio_server.hpp +++ b/src/ana/src/asio_server.hpp @@ -36,7 +36,7 @@ #include #include -#include +#include "utils/boost_function_guarded.hpp" #include "../api/ana.hpp" #include "asio_listener.hpp" diff --git a/src/campaign_server/campaign_server.hpp b/src/campaign_server/campaign_server.hpp index f88d3850992e..a6be6ff9360e 100644 --- a/src/campaign_server/campaign_server.hpp +++ b/src/campaign_server/campaign_server.hpp @@ -19,7 +19,7 @@ #include "network.hpp" #include "server/input_stream.hpp" -#include +#include "utils/boost_function_guarded.hpp" #include #include diff --git a/src/display.hpp b/src/display.hpp index 44d1b1e92fc4..eb153563fdc1 100644 --- a/src/display.hpp +++ b/src/display.hpp @@ -62,7 +62,7 @@ namespace wb { #include "overlay.hpp" -#include +#include "utils/boost_function_guarded.hpp" #include #include #include diff --git a/src/gui/auxiliary/event/dispatcher.hpp b/src/gui/auxiliary/event/dispatcher.hpp index 6d947d538b19..818cfa562d7d 100644 --- a/src/gui/auxiliary/event/dispatcher.hpp +++ b/src/gui/auxiliary/event/dispatcher.hpp @@ -22,7 +22,7 @@ #include "SDL_events.h" -#include +#include "utils/boost_function_guarded.hpp" #include #include diff --git a/src/gui/auxiliary/timer.hpp b/src/gui/auxiliary/timer.hpp index 9dbddc148bef..56c06d463f9a 100644 --- a/src/gui/auxiliary/timer.hpp +++ b/src/gui/auxiliary/timer.hpp @@ -30,7 +30,7 @@ #ifndef GUI_WIDGETS_AUXILIARY_TIMER_HPP_INCLUDED #define GUI_WIDGETS_AUXILIARY_TIMER_HPP_INCLUDED -#include +#include "utils/boost_function_guarded.hpp" #include diff --git a/src/gui/auxiliary/window_builder.hpp b/src/gui/auxiliary/window_builder.hpp index ec48551354e3..6fe6476cfed1 100644 --- a/src/gui/auxiliary/window_builder.hpp +++ b/src/gui/auxiliary/window_builder.hpp @@ -19,7 +19,7 @@ #include "gui/widgets/grid.hpp" #include "reference_counted_object.hpp" -#include +#include "utils/boost_function_guarded.hpp" class config; class CVideo; diff --git a/src/gui/dialogs/dialog.hpp b/src/gui/dialogs/dialog.hpp index 326bbe8ef0ab..ecfee677474e 100644 --- a/src/gui/dialogs/dialog.hpp +++ b/src/gui/dialogs/dialog.hpp @@ -17,7 +17,7 @@ #include "gui/dialogs/field-fwd.hpp" -#include +#include "utils/boost_function_guarded.hpp" #include #include diff --git a/src/gui/widgets/pane.hpp b/src/gui/widgets/pane.hpp index c80c6f7bd846..392c15abfdb6 100644 --- a/src/gui/widgets/pane.hpp +++ b/src/gui/widgets/pane.hpp @@ -19,7 +19,7 @@ #include "gui/auxiliary/window_builder.hpp" #include "gui/auxiliary/placer.hpp" -#include +#include "utils/boost_function_guarded.hpp" #include diff --git a/src/gui/widgets/scrollbar.hpp b/src/gui/widgets/scrollbar.hpp index dc72a017edaf..15c25ba1c500 100644 --- a/src/gui/widgets/scrollbar.hpp +++ b/src/gui/widgets/scrollbar.hpp @@ -18,7 +18,7 @@ #include "gui/auxiliary/notifier.hpp" #include "gui/widgets/control.hpp" -#include +#include "utils/boost_function_guarded.hpp" namespace gui2 { diff --git a/src/gui/widgets/selectable.hpp b/src/gui/widgets/selectable.hpp index 306445133ba8..0d281cf17780 100644 --- a/src/gui/widgets/selectable.hpp +++ b/src/gui/widgets/selectable.hpp @@ -15,7 +15,7 @@ #ifndef GUI_WIDGETS_SELECTABLE_HPP_INCLUDED #define GUI_WIDGETS_SELECTABLE_HPP_INCLUDED -#include +#include "utils/boost_function_guarded.hpp" namespace gui2 { diff --git a/src/gui/widgets/settings.hpp b/src/gui/widgets/settings.hpp index ac4c7f91c4bb..ce38eae741de 100644 --- a/src/gui/widgets/settings.hpp +++ b/src/gui/widgets/settings.hpp @@ -24,7 +24,7 @@ #include "utils/foreach.tpp" -#include +#include "utils/boost_function_guarded.hpp" #include #include diff --git a/src/gui/widgets/text.hpp b/src/gui/widgets/text.hpp index 28390b1a8b27..ad3dc368195d 100644 --- a/src/gui/widgets/text.hpp +++ b/src/gui/widgets/text.hpp @@ -21,7 +21,7 @@ #include -#include +#include "utils/boost_function_guarded.hpp" namespace gui2 { diff --git a/src/gui/widgets/window.hpp b/src/gui/widgets/window.hpp index 699643a8dc19..48f5e4bafc44 100644 --- a/src/gui/widgets/window.hpp +++ b/src/gui/widgets/window.hpp @@ -29,7 +29,7 @@ #include "events.hpp" #include -#include +#include "utils/boost_function_guarded.hpp" class CVideo; diff --git a/src/playturn_network_adapter.hpp b/src/playturn_network_adapter.hpp index be6cbc233b77..c7b93d991675 100644 --- a/src/playturn_network_adapter.hpp +++ b/src/playturn_network_adapter.hpp @@ -5,7 +5,7 @@ #include "config.hpp" #include -#include +#include "utils/boost_function_guarded.hpp" /* The purpose if this class is to preprocess incoming network data, and provide a steam that always returns just one command/action at a time. diff --git a/src/random_new_synced.hpp b/src/random_new_synced.hpp index d54cb114af02..74e568740a27 100644 --- a/src/random_new_synced.hpp +++ b/src/random_new_synced.hpp @@ -20,7 +20,7 @@ #include "random_new.hpp" #include "simple_rng.hpp" -#include +#include "utils/boost_function_guarded.hpp" /* diff --git a/src/server/player_network.hpp b/src/server/player_network.hpp index f38bc3c17e2c..e19050e14ba4 100644 --- a/src/server/player_network.hpp +++ b/src/server/player_network.hpp @@ -20,7 +20,7 @@ #include "player.hpp" #include "simple_wml.hpp" -#include +#include "utils/boost_function_guarded.hpp" namespace wesnothd { diff --git a/src/server/server.hpp b/src/server/server.hpp index 46f14e0bbed9..4d7705b4fce7 100644 --- a/src/server/server.hpp +++ b/src/server/server.hpp @@ -25,7 +25,7 @@ #include "room_manager.hpp" #include "simple_wml.hpp" -#include +#include "utils/boost_function_guarded.hpp" #include class server diff --git a/src/synced_commands.hpp b/src/synced_commands.hpp index cfb30e672902..1c268b615b5e 100644 --- a/src/synced_commands.hpp +++ b/src/synced_commands.hpp @@ -18,7 +18,7 @@ #include #include "config.hpp" -#include +#include "utils/boost_function_guarded.hpp" class synced_command { public: /* diff --git a/src/synced_context.hpp b/src/synced_context.hpp index 1aa7e69a958b..c238e94dfce5 100644 --- a/src/synced_context.hpp +++ b/src/synced_context.hpp @@ -14,7 +14,7 @@ #ifndef SYNCED_CONTEXT_H_INCLUDED #define SYNCED_CONTEXT_H_INCLUDED -#include +#include "utils/boost_function_guarded.hpp" #include "synced_commands.hpp" #include "synced_checkup.hpp" #include "replay.hpp" diff --git a/src/tests/test_sdl_utils.hpp b/src/tests/test_sdl_utils.hpp index c3e15b10e41e..a3b02bf82dcb 100644 --- a/src/tests/test_sdl_utils.hpp +++ b/src/tests/test_sdl_utils.hpp @@ -17,7 +17,7 @@ #include "sdl/utils.hpp" -#include +#include "utils/boost_function_guarded.hpp" typedef boost::function< void(const surface&, const double, const Uint32)> diff --git a/src/utils/boost_function_guarded.hpp b/src/utils/boost_function_guarded.hpp new file mode 100644 index 000000000000..b45fe3860964 --- /dev/null +++ b/src/utils/boost_function_guarded.hpp @@ -0,0 +1,5 @@ +#ifndef INCL_BOOST_FUNCTION_GUARDED_HPP_ +#define INCL_BOOST_FUNCTION_GUARDED_HPP_ +#include +#endif + diff --git a/src/wesmage/filter.cpp b/src/wesmage/filter.cpp index 6a18decacdb2..0fd5e9c1c13f 100644 --- a/src/wesmage/filter.cpp +++ b/src/wesmage/filter.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include "utils/boost_function_guarded.hpp" #include diff --git a/src/whiteboard/utility.hpp b/src/whiteboard/utility.hpp index cc8d7f51fd96..f0c3f7257949 100644 --- a/src/whiteboard/utility.hpp +++ b/src/whiteboard/utility.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include "utils/boost_function_guarded.hpp" #include "typedefs.hpp"