Merge branch 'fixup_external_incl_guards'

wesnoth · Jun 29, 2014 · 8a051a2 · 8a051a2
2 parents ed60036 + 32dc074
commit 8a051a2
Show file tree

Hide file tree

Showing 27 changed files with 46 additions and 156 deletions.
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -1054,6 +1054,7 @@
 		<Unit filename="..\..\src\unit_types.hpp" />
 		<Unit filename="..\..\src\util.cpp" />
 		<Unit filename="..\..\src\util.hpp" />
+		<Unit filename="..\..\src\utils\boost_function_guarded.hpp">
 		<Unit filename="..\..\src\utils\iterator.hpp" />
 		<Unit filename="..\..\src\utils\reference_counter.hpp" />
 		<Unit filename="..\..\src\utils\sha1.cpp" />

diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
@@ -16029,6 +16029,10 @@
 		<Filter
 			Name="utils"
 			>
+			<File
+				RelativePath="..\..\src\utils\boost_function_guarded.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\utils\iterator.hpp"
 				>
@@ -16037,6 +16041,18 @@
 				RelativePath="..\..\src\utils\reference_counter.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\utils\sha1.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\sha1.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\utils\shared_object.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\utils\smart_list.hpp"
 				>
@@ -20948,18 +20964,6 @@
 			RelativePath="..\..\src\settings.hpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\src\utils\sha1.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\utils\sha1.hpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\src\utils\shared_object.hpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\src\show_dialog.cpp"
 			>

diff --git a/src/ai/composite/ai.cpp b/src/ai/composite/ai.cpp
@@ -29,12 +29,7 @@
 #include "../../log.hpp"
 
 #include <boost/bind.hpp>
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 #include <boost/foreach.hpp>
 
 namespace ai {

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 #include <boost/foreach.hpp>
 
 #include "config.hpp"

diff --git a/src/ana/src/asio_server.hpp b/src/ana/src/asio_server.hpp
@@ -36,12 +36,7 @@
 
 #include <boost/asio.hpp>
 #include <boost/interprocess/smart_ptr/unique_ptr.hpp>
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#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
@@ -19,12 +19,7 @@
 #include "network.hpp"
 #include "server/input_stream.hpp"
 
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 #include <boost/scoped_ptr.hpp>
 #include <boost/unordered_map.hpp>
 

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 #include <boost/weak_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <deque>

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 #include <boost/mpl/int.hpp>
 #include <boost/utility/enable_if.hpp>
 

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 #include <SDL_types.h>
 

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 class config;
 class CVideo;

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 #include <string>
 #include <vector>

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 #include <list>
 

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 namespace gui2
 {

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 namespace gui2
 {

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 #include <string>
 #include <vector>

diff --git a/src/gui/widgets/text.hpp b/src/gui/widgets/text.hpp
@@ -21,12 +21,7 @@
 
 #include <string>
 
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 namespace gui2
 {

diff --git a/src/gui/widgets/window.hpp b/src/gui/widgets/window.hpp
@@ -29,12 +29,7 @@
 #include "events.hpp"
 
 #include <string>
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 class CVideo;
 

diff --git a/src/playturn_network_adapter.hpp b/src/playturn_network_adapter.hpp
@@ -5,12 +5,7 @@
 
 #include "config.hpp"
 #include <list>
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#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
@@ -20,12 +20,7 @@
 #include "random_new.hpp"
 #include "simple_rng.hpp"
 
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 
 /*

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 namespace wesnothd {
 

diff --git 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 <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 #include <boost/scoped_ptr.hpp>
 
 class server

diff --git a/src/synced_commands.hpp b/src/synced_commands.hpp
@@ -18,12 +18,7 @@
 #include <exception>
 #include "config.hpp"
 
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 class synced_command {
 	public:
 		/*

diff --git 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 <boost/function.hpp>
-#endif
-
+#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
@@ -17,12 +17,7 @@
 
 #include "sdl/utils.hpp"
 
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#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
@@ -0,0 +1,5 @@
+#ifndef INCL_BOOST_FUNCTION_GUARDED_HPP_
+#define INCL_BOOST_FUNCTION_GUARDED_HPP_
+#include <boost/function.hpp>
+#endif
+
diff --git a/src/wesmage/filter.cpp b/src/wesmage/filter.cpp
@@ -19,12 +19,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 #include <iostream>
 

diff --git a/src/whiteboard/utility.hpp b/src/whiteboard/utility.hpp
@@ -22,12 +22,7 @@
 #include <vector>
 #include <deque>
 
-
-#ifndef INCL_BOOST_FUNCTION_HPP_
-#define INCL_BOOST_FUNCTION_HPP_
-#include <boost/function.hpp>
-#endif
-
+#include "utils/boost_function_guarded.hpp"
 
 #include "typedefs.hpp"