revert and fixup boost/function.hpp external include guards

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" />

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"
 			>

src/ai/composite/ai.cpp

@@ -29,7 +29,7 @@
 #include "../../log.hpp"
 
 #include <boost/bind.hpp>
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 #include <boost/foreach.hpp>
 
 namespace ai {

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

src/ana/src/asio_server.hpp

@@ -36,7 +36,7 @@
 
 #include <boost/asio.hpp>
 #include <boost/interprocess/smart_ptr/unique_ptr.hpp>
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 #include "../api/ana.hpp"
 #include "asio_listener.hpp"

src/campaign_server/campaign_server.hpp

@@ -19,7 +19,7 @@
 #include "network.hpp"
 #include "server/input_stream.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 #include <boost/scoped_ptr.hpp>
 #include <boost/unordered_map.hpp>
 

src/display.hpp

@@ -62,7 +62,7 @@ namespace wb {
 
 #include "overlay.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 #include <boost/weak_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <deque>

src/gui/auxiliary/event/dispatcher.hpp

@@ -22,7 +22,7 @@
 
 #include "SDL_events.h"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 #include <boost/mpl/int.hpp>
 #include <boost/utility/enable_if.hpp>
 

src/gui/auxiliary/timer.hpp

@@ -30,7 +30,7 @@
 #ifndef GUI_WIDGETS_AUXILIARY_TIMER_HPP_INCLUDED
 #define GUI_WIDGETS_AUXILIARY_TIMER_HPP_INCLUDED
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 #include <SDL_types.h>
 

src/gui/auxiliary/window_builder.hpp

@@ -19,7 +19,7 @@
 #include "gui/widgets/grid.hpp"
 #include "reference_counted_object.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 class config;
 class CVideo;

src/gui/dialogs/dialog.hpp

@@ -17,7 +17,7 @@
 
 #include "gui/dialogs/field-fwd.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 #include <string>
 #include <vector>

src/gui/widgets/pane.hpp

@@ -19,7 +19,7 @@
 #include "gui/auxiliary/window_builder.hpp"
 #include "gui/auxiliary/placer.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 #include <list>
 

src/gui/widgets/scrollbar.hpp

@@ -18,7 +18,7 @@
 #include "gui/auxiliary/notifier.hpp"
 #include "gui/widgets/control.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 namespace gui2
 {

src/gui/widgets/selectable.hpp

@@ -15,7 +15,7 @@
 #ifndef GUI_WIDGETS_SELECTABLE_HPP_INCLUDED
 #define GUI_WIDGETS_SELECTABLE_HPP_INCLUDED
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 namespace gui2
 {

src/gui/widgets/settings.hpp

@@ -24,7 +24,7 @@
 
 #include "utils/foreach.tpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 #include <string>
 #include <vector>

src/gui/widgets/text.hpp

@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 namespace gui2
 {

src/gui/widgets/window.hpp

@@ -29,7 +29,7 @@
 #include "events.hpp"
 
 #include <string>
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 class CVideo;
 

src/playturn_network_adapter.hpp

@@ -5,7 +5,7 @@
 
 #include "config.hpp"
 #include <list>
-#include <boost/function.hpp>
+#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.

src/random_new_synced.hpp

@@ -20,7 +20,7 @@
 #include "random_new.hpp"
 #include "simple_rng.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 
 /*

src/server/player_network.hpp

@@ -20,7 +20,7 @@
 #include "player.hpp"
 #include "simple_wml.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 namespace wesnothd {
 

src/server/server.hpp

@@ -25,7 +25,7 @@
 #include "room_manager.hpp"
 #include "simple_wml.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 #include <boost/scoped_ptr.hpp>
 
 class server

src/synced_commands.hpp

@@ -18,7 +18,7 @@
 #include <exception>
 #include "config.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 class synced_command {
 	public:
 		/*

src/synced_context.hpp

@@ -14,7 +14,7 @@
 #ifndef SYNCED_CONTEXT_H_INCLUDED
 #define SYNCED_CONTEXT_H_INCLUDED
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 #include "synced_commands.hpp"
 #include "synced_checkup.hpp"
 #include "replay.hpp"

src/tests/test_sdl_utils.hpp

@@ -17,7 +17,7 @@
 
 #include "sdl/utils.hpp"
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 typedef boost::function<
 		void(const surface&, const double, const Uint32)>

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
+

src/wesmage/filter.cpp

@@ -19,7 +19,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 #include <iostream>
 

src/whiteboard/utility.hpp

@@ -22,7 +22,7 @@
 #include <vector>
 #include <deque>
 
-#include <boost/function.hpp>
+#include "utils/boost_function_guarded.hpp"
 
 #include "typedefs.hpp"