Merge lp:~widelands-dev/widelands/bug-1332627 into lp:widelands

[SirVer]

Removes boost::noncopyable and replaces it through a macro.

[SirVer (sirver)]

Great work!!!

- I think we should be consistent about where to place these macros.

1) Google style is to have them as the last thing in the class and always in a private statement. I like this because I am used to it and because it is already 'out there'.
2) One could argue that being not copyable is part of the public API - so it should be in the face of the user of the class (around the constructor or so). It is never that important in practice though since most classes that are designed not be copied will only be copied on accident - and it is fine if the compiler gives a warning then.

I vote for 1 with a slight variation: For c++11 it is no longer necessary for this to be in the private section of the class, so I would just state 'as last statement in your class' in the codecheck rule.

- Compile errors:

I think the problem you saw came from not delete'ing the copy constructor and operator=, but defining them and never declaring them. This is the prec++11 way of doing this macro - it has the disadvantage, that you promise the compiler to implement any constructor (the copy constructor) and so it no longer defines a default constructor for you. If you use the c++11 way:

#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&) = delete; \
void operator=(const TypeName&) = delete

it should no longer complain. If am wrong and it still does adding a `TypeName() = default;` into the class that blows up should help out.

review: Needs Fixing

[GunChleoc (gunchleoc)]

I did the change to the macro.

struct ITransportCostCalculator {
 virtual ~ITransportCostCalculator() {}

 virtual int32_t calc_cost_estimate(Coords, Coords) const = 0;
 DISALLOW_COPY_AND_ASSIGN(ITransportCostCalculator);
 TypeName() = default;
};

results in:

[ 5%] Building CXX object src/wui/CMakeFiles/wui.dir/actionconfirm.cc.o
In file included from /home/bratzbert/sources/widelands/bug-1332627/src/logic/map.h:31:0,
                 from /home/bratzbert/sources/widelands/bug-1332627/src/logic/editor_game_base.h:31,
                 from /home/bratzbert/sources/widelands/bug-1332627/src/logic/player.h:27,
                 from /home/bratzbert/sources/widelands/bug-1332627/src/wui/actionconfirm.cc:28:
/home/bratzbert/sources/widelands/bug-1332627/src/economy/itransport_cost_calculator.h:40:15: error: ISO C++ forbids declaration of ‘TypeName’ with no type [-fpermissive]
/home/bratzbert/sources/widelands/bug-1332627/src/economy/itransport_cost_calculator.h:40:15: error: ‘int Widelands::ITransportCostCalculator::TypeName()’ cannot be defaulted

=========================

struct ITransportCostCalculator {
 virtual ~ITransportCostCalculator() {}

 virtual int32_t calc_cost_estimate(Coords, Coords) const = 0;
 DISALLOW_COPY_AND_ASSIGN(ITransportCostCalculator);
};

results in:

[ 19%] Building CXX object src/logic/CMakeFiles/logic.dir/map.cc.o
/home/bratzbert/sources/widelands/bug-1332627/src/logic/map.cc: In constructor ‘Widelands::Map::Map()’:
/home/bratzbert/sources/widelands/bug-1332627/src/logic/map.cc:73:39: error: no matching function for call to ‘Widelands::ITransportCostCalculator::ITransportCostCalculator()’
/home/bratzbert/sources/widelands/bug-1332627/src/logic/map.cc:73:39: note: candidate is:
In file included from /home/bratzbert/sources/widelands/bug-1332627/src/logic/map.h:31:0,
                 from /home/bratzbert/sources/widelands/bug-1332627/src/logic/map.cc:20:
/home/bratzbert/sources/widelands/bug-1332627/src/economy/itransport_cost_calculator.h:39:2: note: Widelands::ITransportCostCalculator::ITransportCostCalculator(const Widelands::ITransportCostCalculator&) <deleted>
/home/bratzbert/sources/widelands/bug-1332627/src/economy/itransport_cost_calculator.h:39:2: note: candidate expects 1 argument, 0 provided

[SirVer (sirver)]

 TypeName() = default; should be here
ITransportCostCalculator() = default

And I was wrong in my first comment. It is needed when the copy constructor is deleted.

[GunChleoc (gunchleoc)]

src/wui/unique_window_handler.h creates a linking problem. so I reverted it. All the rest are done. Please double-check the codecheck rule.

[SirVer (sirver)]

Awesome! Merged. I tweaked the codecheck rule and fixed the remaining boost::noncopyable. The linking error probably came from not fixing the dependencies in the CMakeLists.txt files. make codecheck lists those.

[SirVer (sirver)]

On second thought, that cannot really explain linker errors. If you still have them after a make clean please open a bug report and we'll investigate.

[GunChleoc (gunchleoc)]

I merged it into another branch and it worked :)

=== added file 'cmake/codecheck/rules/do_not_use_BOOST_noncopyable'
--- cmake/codecheck/rules/do_not_use_BOOST_noncopyable	1970-01-01 00:00:00 +0000
+++ cmake/codecheck/rules/do_not_use_BOOST_noncopyable	2014-07-14 19:24:49 +0000
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+
+"""
+Prefer DEBUG.
+"""
+
+error_msg="Do not inherit from boost::noncopyable. Instead #include \"base/macros.h\" and add \"DISALLOW_COPY_AND_ASSIGN(<Objectname>);\" to the private section of the object or type."
+
+regexp=r"""(^#include.*boost.noncopyable\.hpp|noncopyable)"""
+
+forbidden = [
+    "#include <boost/noncopyable.hpp>",
+    "noncopyable"
+]
+
+allowed = [
+    "DISALLOW_COPY_AND_ASSIGN",
+]

=== modified file 'src/ai/ai_hints.h'
--- src/ai/ai_hints.h	2014-07-14 07:31:18 +0000
+++ src/ai/ai_hints.h	2014-07-14 19:24:49 +0000
@@ -21,14 +21,19 @@
 #define WL_AI_AI_HINTS_H
 
 #include <stdint.h>
+<<<<<<< TREE
 #include <boost/noncopyable.hpp>
+=======
+
+#include "base/macros.h"
+>>>>>>> MERGE-SOURCE
 
 class Section;
 
 /// This struct is used to read out the data given in [aihints] section of a
 /// buildings conf file. It is used to tell the computer player about the
 /// special properties of a building.
-struct BuildingHints : boost::noncopyable {
+struct BuildingHints {
 	BuildingHints(Section*);
 	~BuildingHints();
 
@@ -110,6 +115,7 @@
 	bool fighting_;
 	bool mountain_conqueror_;
 	uint8_t mines_percent_;
+	DISALLOW_COPY_AND_ASSIGN(BuildingHints);
 };
 
 #endif  // end of include guard: WL_AI_AI_HINTS_H

=== modified file 'src/ai/computer_player.h'
--- src/ai/computer_player.h	2014-07-05 16:41:51 +0000
+++ src/ai/computer_player.h	2014-07-14 19:24:49 +0000
@@ -20,8 +20,7 @@
 #ifndef WL_AI_COMPUTER_PLAYER_H
 #define WL_AI_COMPUTER_PLAYER_H
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "logic/game.h"
 #include "logic/notification.h"
 
@@ -32,7 +31,6 @@
  * \ref Implementation interface.
  */
 struct Computer_Player :
-	boost::noncopyable,
 	Widelands::NoteReceiver<Widelands::NoteImmovable>,
 	Widelands::NoteReceiver<Widelands::NoteFieldPossession>
 {
@@ -74,6 +72,7 @@
 private:
 	Widelands::Game & m_game;
 	Widelands::Player_Number const m_player_number;
+	DISALLOW_COPY_AND_ASSIGN(Computer_Player);
 };
 
 #endif  // end of include guard: WL_AI_COMPUTER_PLAYER_H

=== modified file 'src/base/macros.h'
--- src/base/macros.h	2014-07-05 16:41:51 +0000
+++ src/base/macros.h	2014-07-14 19:24:49 +0000
@@ -65,6 +65,12 @@
 #define DIAG_OFF(x) GCC_DIAG_OFF(x) CLANG_DIAG_OFF(x)
 #define DIAG_ON(x) GCC_DIAG_ON(x) CLANG_DIAG_ON(x)
 
+// disallow copying or assigning a class
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+TypeName(const TypeName&) = delete; \
+void operator=(const TypeName&) = delete
+
+
 /// Wrapper macro around a dynamic_cast.
 #define upcast(type, identifier, source) type * const identifier = \
 dynamic_cast<type *>(source)

=== modified file 'src/base/scoped_timer.h'
--- src/base/scoped_timer.h	2014-07-05 16:41:51 +0000
+++ src/base/scoped_timer.h	2014-07-14 19:24:49 +0000
@@ -23,13 +23,13 @@
 #include <string>
 #include <stdint.h>
 
-#include <boost/noncopyable.hpp>
+#include "base/macros.h"
 
 /**
  * A cheap timer class that can be queried for timings and will print out
  * it's total time in existence on destruction.
  */
-class ScopedTimer : boost::noncopyable {
+class ScopedTimer {
 public:
 	// Takes the output message that will be boost::format() with the total time
 	// this object existed (in ms, use %u).
@@ -44,6 +44,8 @@
 private:
 	std::string message_;
 	uint32_t startime_, lasttime_;
+
+	DISALLOW_COPY_AND_ASSIGN(ScopedTimer);
 };
 
 #endif  // end of include guard: WL_BASE_SCOPED_TIMER_H

=== modified file 'src/economy/economy.h'
--- src/economy/economy.h	2014-07-05 16:41:51 +0000
+++ src/economy/economy.h	2014-07-14 19:24:49 +0000
@@ -27,6 +27,7 @@
 #include <boost/function.hpp>
 #include <boost/utility.hpp>
 
+#include "base/macros.h"
 #include "logic/instances.h"
 #include "logic/warelist.h"
 #include "logic/wareworker.h"
@@ -71,7 +72,7 @@
  * connected by roads or the seafaring network - though of course, most code operates
  * on the assumption that they are, with fallbacks for when they aren't.
  */
-class Economy : boost::noncopyable {
+class Economy {
 public:
 	friend class EconomyDataPacket;
 
@@ -182,7 +183,7 @@
 
 	void rebalance_supply() {_start_request_timer();}
 
-private:
+	DISALLOW_COPY_AND_ASSIGN(Economy);
 /*************/
 /* Functions */
 /*************/

=== modified file 'src/economy/itransport_cost_calculator.h'
--- src/economy/itransport_cost_calculator.h	2014-07-05 16:41:51 +0000
+++ src/economy/itransport_cost_calculator.h	2014-07-14 19:24:49 +0000
@@ -20,8 +20,7 @@
 #ifndef WL_ECONOMY_ITRANSPORT_COST_CALCULATOR_H
 #define WL_ECONOMY_ITRANSPORT_COST_CALCULATOR_H
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "logic/widelands_geometry.h"
 
 namespace Widelands {
@@ -33,10 +32,12 @@
  * At the time of this writing, Map implements all of this functionality
  * but most economy code doesn't need all of maps functionality
  */
-struct ITransportCostCalculator : boost::noncopyable {
+struct ITransportCostCalculator {
+	ITransportCostCalculator() = default;
 	virtual ~ITransportCostCalculator() {}
 
 	virtual int32_t calc_cost_estimate(Coords, Coords) const = 0;
+	DISALLOW_COPY_AND_ASSIGN(ITransportCostCalculator);
 };
 
 }

=== modified file 'src/editor/tools/editor_tool.h'
--- src/editor/tools/editor_tool.h	2014-07-05 16:41:51 +0000
+++ src/editor/tools/editor_tool.h	2014-07-14 19:24:49 +0000
@@ -22,8 +22,7 @@
 
 #define MAX_TOOL_AREA 9
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "editor/tools/editor_action_args.h"
 #include "logic/widelands_geometry.h"
 
@@ -39,7 +38,7 @@
  * one function (like delete_building, place building, modify building are 3
  * tools).
  */
-class Editor_Tool : boost::noncopyable {
+class Editor_Tool {
 public:
 	Editor_Tool(Editor_Tool & second, Editor_Tool & third, bool uda = true) :
 		m_second(second), m_third(third), undoable(uda)
@@ -102,6 +101,8 @@
 protected:
 	Editor_Tool & m_second, & m_third;
 	bool undoable;
+
+	DISALLOW_COPY_AND_ASSIGN(Editor_Tool);
 };
 
 #endif  // end of include guard: WL_EDITOR_TOOLS_EDITOR_TOOL_H

=== modified file 'src/graphic/animation.cc'
--- src/graphic/animation.cc	2014-07-12 20:37:13 +0000
+++ src/graphic/animation.cc	2014-07-14 19:24:49 +0000
@@ -33,6 +33,7 @@
 #include "base/deprecated.h"
 #include "base/i18n.h"
 #include "base/log.h"
+#include "base/macros.h"
 #include "base/wexception.h"
 #include "graphic/diranimations.h"
 #include "graphic/graphic.h"
@@ -55,7 +56,7 @@
 namespace  {
 
 /// A class that makes iteration over filename_?.png templates easy.
-class NumberGlob : boost::noncopyable {
+class NumberGlob {
 public:
 	typedef uint32_t type;
 	NumberGlob(const std::string& pictmp);
@@ -69,6 +70,7 @@
 	std::string replstr_;
 	uint32_t cur_;
 	uint32_t max_;
+	DISALLOW_COPY_AND_ASSIGN(NumberGlob);
 };
 
 /**

=== modified file 'src/graphic/animation.h'
--- src/graphic/animation.h	2014-07-05 16:41:51 +0000
+++ src/graphic/animation.h	2014-07-14 19:24:49 +0000
@@ -27,6 +27,7 @@
 
 #include <boost/utility.hpp>
 
+#include "base/macros.h"
 #include "base/point.h"
 #include "base/rect.h"
 
@@ -48,7 +49,7 @@
  * The dimensions of an animation is constant and can not change from frame to
  * frame.
  */
-class Animation : boost::noncopyable {
+class Animation {
 public:
 	Animation() {}
 	virtual ~Animation() {}
@@ -87,6 +88,8 @@
 
 	/// Play the sound effect associated with this animation at the given time.
 	virtual void trigger_soundfx(uint32_t time, uint32_t stereo_position) const = 0;
+
+	DISALLOW_COPY_AND_ASSIGN(Animation);
 };
 
 /**

=== modified file 'src/graphic/font_handler1.h'
--- src/graphic/font_handler1.h	2014-07-05 19:33:23 +0000
+++ src/graphic/font_handler1.h	2014-07-14 19:24:49 +0000
@@ -23,10 +23,10 @@
 
 #include <string>
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
+#include "base/point.h"
 #include "graphic/align.h"
-#include "base/point.h"
+
 
 class FileSystem;
 class Image;
@@ -37,8 +37,9 @@
 /**
  * Main class for string rendering. Manages the cache of pre-rendered strings.
  */
-class IFont_Handler1 : boost::noncopyable {
+class IFont_Handler1 {
 public:
+	IFont_Handler1() = default;
 	virtual ~IFont_Handler1() {}
 
 	/*
@@ -46,6 +47,7 @@
 	 * ownership remains with this class. Will throw on error.
 	 */
 	virtual const Image* render(const std::string& text, uint16_t w = 0) = 0;
+	DISALLOW_COPY_AND_ASSIGN(IFont_Handler1);
 };
 
 // Create a new Font_Handler1. Ownership for the objects is not taken.

=== modified file 'src/graphic/image.h'
--- src/graphic/image.h	2014-07-05 16:41:51 +0000
+++ src/graphic/image.h	2014-07-14 19:24:49 +0000
@@ -22,17 +22,19 @@
 
 #include <string>
 
-#include <boost/noncopyable.hpp>
 #include <stdint.h>
 
+#include "base/macros.h"
+
 /**
  * Interface to a bitmap that can act as the source of a rendering
  * operation.
  */
 class Surface;
 
-class Image : boost::noncopyable {
+class Image {
 public:
+	Image() = default;
 	virtual ~Image() {}
 
 	virtual uint16_t width() const = 0;
@@ -41,6 +43,7 @@
 	// Internal functions needed for caching.
 	virtual Surface* surface() const = 0;
 	virtual const std::string& hash() const = 0;
+	DISALLOW_COPY_AND_ASSIGN(Image);
 };
 
 

=== modified file 'src/graphic/image_cache.h'
--- src/graphic/image_cache.h	2014-07-05 19:33:23 +0000
+++ src/graphic/image_cache.h	2014-07-14 19:24:49 +0000
@@ -25,6 +25,7 @@
 
 #include <boost/utility.hpp>
 
+#include "base/macros.h"
 #include "graphic/image.h"
 
 class SurfaceCache;
@@ -36,7 +37,7 @@
 // its hash is not found. Other parts of Widelands will create images when they
 // do not exist in the cache yet and then put it into the cache and therefore
 // releasing their ownership.
-class ImageCache : boost::noncopyable {
+class ImageCache {
 public:
 	// Does not take ownership.
 	ImageCache(SurfaceCache* surface_cache);
@@ -60,6 +61,7 @@
 
 	ImageMap images_;  /// hash of cached filename/image pairs
 	SurfaceCache* const surface_cache_;  // Not owned.
+	DISALLOW_COPY_AND_ASSIGN(ImageCache);
 };
 
 #endif  // end of include guard: WL_GRAPHIC_IMAGE_CACHE_H

=== modified file 'src/graphic/render/gamerenderer.h'
--- src/graphic/render/gamerenderer.h	2014-07-05 16:41:51 +0000
+++ src/graphic/render/gamerenderer.h	2014-07-14 19:24:49 +0000
@@ -22,6 +22,7 @@
 
 #include <boost/utility.hpp>
 
+#include "base/macros.h"
 #include "base/point.h"
 
 namespace Widelands {
@@ -41,7 +42,7 @@
  * so that target-specific optimizations (such as caching data) can
  * be effective.
  */
-class GameRenderer : boost::noncopyable {
+class GameRenderer {
 public:
 	GameRenderer();
 	virtual ~GameRenderer();
@@ -94,6 +95,7 @@
 
 private:
 	void draw_wrapper();
+	DISALLOW_COPY_AND_ASSIGN(GameRenderer);
 };
 
 #endif  // end of include guard: WL_GRAPHIC_RENDER_GAMERENDERER_H

=== modified file 'src/graphic/surface.h'
--- src/graphic/surface.h	2014-07-05 19:33:23 +0000
+++ src/graphic/surface.h	2014-07-14 19:24:49 +0000
@@ -20,8 +20,7 @@
 #ifndef WL_GRAPHIC_SURFACE_H
 #define WL_GRAPHIC_SURFACE_H
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "base/rect.h"
 #include "graphic/color.h"
 #include "graphic/compositemode.h"
@@ -30,7 +29,7 @@
  * Interface to a basic surfaces that can be used as destination for blitting and drawing.
  * It also allows low level pixel access.
  */
-class Surface : boost::noncopyable {
+class Surface  {
 public:
 	// Surfaces can either be converted to display format on creation or kept in
 	// the format they were created. The only reason not to convert to display
@@ -46,6 +45,7 @@
 	// dimensions.
 	static Surface* create(uint16_t w, uint16_t h);
 
+	Surface() = default;
 	virtual ~Surface() {}
 
 	/// Dimensions.
@@ -135,6 +135,8 @@
 	 * \warning May only be called inside lock/unlock pairs.
 	 */
 	virtual uint8_t * get_pixels() const = 0;
+
+	DISALLOW_COPY_AND_ASSIGN(Surface);
 };
 
 #endif  // end of include guard: WL_GRAPHIC_SURFACE_H

=== modified file 'src/graphic/surface_cache.h'
--- src/graphic/surface_cache.h	2014-07-05 16:41:51 +0000
+++ src/graphic/surface_cache.h	2014-07-14 19:24:49 +0000
@@ -24,6 +24,8 @@
 
 #include <boost/utility.hpp>
 
+#include "base/macros.h"
+
 class Surface;
 
 // Caches Surfaces. It contains surfaces which must not be deleted and
@@ -33,7 +35,7 @@
 // Nobody in Widelands should hold onto a Surface they get from this class,
 // instead, they should use it only temporarily and rerequest it whenever they
 // need it.
-class SurfaceCache : boost::noncopyable {
+class SurfaceCache {
 public:
 	SurfaceCache() {}
 	virtual ~SurfaceCache() {}
@@ -50,6 +52,8 @@
 	// automatically - use this if surfaces are around for a long time and
 	// recreation is expensive (i.e. images loaded from disk).
 	virtual Surface* insert(const std::string& hash, Surface*, bool transient) = 0;
+
+	DISALLOW_COPY_AND_ASSIGN(SurfaceCache);
 };
 
 // Create a new Cache whichs combined pixels in all transient surfaces are

=== modified file 'src/io/filesystem/filesystem.h'
--- src/io/filesystem/filesystem.h	2014-07-05 16:41:51 +0000
+++ src/io/filesystem/filesystem.h	2014-07-14 19:24:49 +0000
@@ -28,7 +28,6 @@
 #include <vector>
 
 #include <stdint.h>
-#include <boost/noncopyable.hpp>
 
 #include "io/filesystem/filesystem_exceptions.h"
 

=== modified file 'src/io/streamread.h'
--- src/io/streamread.h	2014-07-05 16:41:51 +0000
+++ src/io/streamread.h	2014-07-14 19:24:49 +0000
@@ -23,8 +23,7 @@
 #include <cstring>
 #include <string>
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "base/wexception.h"
 #include "machdep.h"
 
@@ -42,7 +41,7 @@
  *
  * Convenience functions are provided for many data types.
  */
-class StreamRead : boost::noncopyable {
+class StreamRead {
 public:
 	explicit StreamRead() {}
 	virtual ~StreamRead();
@@ -77,6 +76,8 @@
 		_data_error(char const * const fmt, ...) PRINTF_FORMAT(2, 3);
 	};
 #define data_error(...) _data_error(__VA_ARGS__)
+
+	DISALLOW_COPY_AND_ASSIGN(StreamRead);
 };
 
 #endif  // end of include guard: WL_IO_STREAMREAD_H

=== modified file 'src/io/streamwrite.h'
--- src/io/streamwrite.h	2014-07-05 16:41:51 +0000
+++ src/io/streamwrite.h	2014-07-14 19:24:49 +0000
@@ -25,8 +25,6 @@
 #include <limits>
 #include <string>
 
-#include <boost/noncopyable.hpp>
-
 #include "base/macros.h"
 #include "machdep.h"
 
@@ -40,7 +38,7 @@
  *
  * Convenience functions are provided for many data types.
  */
-class StreamWrite : boost::noncopyable {
+class StreamWrite {
 public:
 	explicit StreamWrite() {}
 	virtual ~StreamWrite();
@@ -90,6 +88,8 @@
 	//  Write strings without null terminator.
 	void Text   (char        const * const x) {Data(x,         strlen(x));}
 	void Text   (const std::string &       x) {Data(x.c_str(), x.size());}
+
+	DISALLOW_COPY_AND_ASSIGN(StreamWrite);
 };
 
 #endif  // end of include guard: WL_IO_STREAMWRITE_H

=== modified file 'src/logic/cookie_priority_queue.h'
--- src/logic/cookie_priority_queue.h	2014-07-05 16:41:51 +0000
+++ src/logic/cookie_priority_queue.h	2014-07-14 19:24:49 +0000
@@ -25,7 +25,7 @@
 #include <limits>
 #include <vector>
 
-#include <boost/noncopyable.hpp>
+#include "base/macros.h"
 
 template<typename _Type>
 struct default_cookie_accessor;
@@ -36,7 +36,7 @@
 	typedef std::vector<type *> container;
 	typedef typename container::size_type size_type;
 
-	struct cookie : boost::noncopyable {
+	struct cookie {
 		cookie() : pos(bad_pos()) {}
 		~cookie() {}
 
@@ -47,6 +47,8 @@
 		friend struct cookie_priority_queue_base<_Type>;
 
 		size_type pos;
+
+		DISALLOW_COPY_AND_ASSIGN(cookie);
 	};
 
 protected:

=== modified file 'src/logic/editor_game_base.h'
--- src/logic/editor_game_base.h	2014-07-14 07:31:18 +0000
+++ src/logic/editor_game_base.h	2014-07-14 19:24:49 +0000
@@ -25,8 +25,7 @@
 #include <string>
 #include <vector>
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "logic/bob.h"
 #include "logic/building.h"
 #include "logic/map.h"
@@ -55,7 +54,6 @@
 struct AttackController;
 
 class Editor_Game_Base :
-	boost::noncopyable,
 	NoteReceiver<NoteImmovable>,
 	NoteReceiver<NoteFieldPossession>,
 	NoteReceiver<NoteFieldTransformed>
@@ -222,6 +220,7 @@
 		 bool          neutral_when_competing_influence               = false,
 		 bool          conquer_guarded_location_by_superior_influence = false);
 	void cleanup_playerimmovables_area(Player_Area<Area<FCoords> >);
+	DISALLOW_COPY_AND_ASSIGN(Editor_Game_Base);
 };
 
 #define iterate_players_existing(p, nr_players, egbase, player)               \

=== modified file 'src/logic/expedition_bootstrap.h'
--- src/logic/expedition_bootstrap.h	2014-07-05 16:41:51 +0000
+++ src/logic/expedition_bootstrap.h	2014-07-14 19:24:49 +0000
@@ -23,8 +23,7 @@
 #include <vector>
 #include <memory>
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "economy/wares_queue.h"
 
 namespace Widelands {
@@ -43,7 +42,7 @@
 // Handles the mustering of workers and wares in a port for one Expedition. This
 // object is created in the port dock as soon as the start expedition button is
 // pressed. As soon as the ship is loaded, this object gets destroyed.
-class ExpeditionBootstrap : boost::noncopyable {
+class ExpeditionBootstrap {
 public:
 	ExpeditionBootstrap(PortDock* const portdock);
 	virtual ~ExpeditionBootstrap();
@@ -97,6 +96,7 @@
 
 	std::vector<std::unique_ptr<WaresQueue>> wares_;
 	std::vector<std::unique_ptr<ExpeditionWorker>> workers_;
+	DISALLOW_COPY_AND_ASSIGN(ExpeditionBootstrap);
 };
 
 }  // namespace Widelands

=== modified file 'src/logic/immovable_program.h'
--- src/logic/immovable_program.h	2014-07-05 16:41:51 +0000
+++ src/logic/immovable_program.h	2014-07-14 19:24:49 +0000
@@ -23,7 +23,7 @@
 #include <cstring>
 #include <string>
 
-#include <boost/noncopyable.hpp>
+#include "base/macros.h"
 
 /*
  * Implementation is in immovable.cc
@@ -40,9 +40,12 @@
 struct ImmovableProgram {
 
 	/// Can be executed on an Immovable.
-	struct Action : boost::noncopyable {
+	struct Action  {
+		Action() = default;
 		virtual ~Action();
 		virtual void execute(Game &, Immovable &) const = 0;
+
+		DISALLOW_COPY_AND_ASSIGN(Action);
 	};
 
 	/// Runs an animation.

=== modified file 'src/logic/instances.h'
--- src/logic/instances.h	2014-07-05 16:41:51 +0000
+++ src/logic/instances.h	2014-07-14 19:24:49 +0000
@@ -27,7 +27,6 @@
 #include <vector>
 
 #include <boost/function.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/unordered_map.hpp>
 #include <boost/signals2.hpp>
 
@@ -53,7 +52,7 @@
  * Base class for descriptions of worker, files and so on. This must just
  * link them together
  */
-struct Map_Object_Descr : boost::noncopyable {
+struct Map_Object_Descr {
 	Map_Object_Descr(const std::string& init_name, const std::string& init_descname)
 	   : m_name(init_name), m_descname(init_descname) {
 	}
@@ -102,6 +101,7 @@
 	static uint32_t   s_dyn_attribhigh; ///< highest attribute ID used
 	static AttribMap  s_dyn_attribs;
 
+	DISALLOW_COPY_AND_ASSIGN(Map_Object_Descr);
 };
 
 /**
@@ -148,7 +148,7 @@
       return ref_cast<type const, Map_Object_Descr const>(*m_descr);          \
    }                                                                          \
 
-class Map_Object : boost::noncopyable {
+class Map_Object {
 	friend struct Object_Manager;
 	friend struct Object_Ptr;
 
@@ -326,6 +326,8 @@
 	const Map_Object_Descr * m_descr;
 	Serial                   m_serial;
 	LogSink                * m_logsink;
+
+	DISALLOW_COPY_AND_ASSIGN(Map_Object);
 };
 
 inline int32_t get_reverse_dir(int32_t const dir) {
@@ -337,7 +339,7 @@
  *
  * Keeps the list of all objects currently in the game.
  */
-struct Object_Manager : boost::noncopyable {
+struct Object_Manager  {
 	typedef boost::unordered_map<Serial, Map_Object *> objmap_t;
 
 	Object_Manager() {m_lastserial = 0;}
@@ -374,6 +376,8 @@
 private:
 	Serial   m_lastserial;
 	objmap_t m_objects;
+
+	DISALLOW_COPY_AND_ASSIGN(Object_Manager);
 };
 
 /**

=== modified file 'src/logic/message_queue.h'
--- src/logic/message_queue.h	2014-07-05 16:41:51 +0000
+++ src/logic/message_queue.h	2014-07-14 19:24:49 +0000
@@ -23,14 +23,13 @@
 #include <cassert>
 #include <map>
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "logic/message.h"
 #include "logic/message_id.h"
 
 namespace Widelands {
 
-struct MessageQueue : boost::noncopyable, private std::map<Message_Id, Message *> {
+struct MessageQueue : private std::map<Message_Id, Message *> {
 	friend class Map_Players_Messages_Data_Packet;
 	// Make typedefs public so that this looks like proper
 	// STL container to templated algorithms.
@@ -181,6 +180,8 @@
 			 m_counts[Message::Read] +
 			 m_counts[Message::Archived]);
 	}
+
+	DISALLOW_COPY_AND_ASSIGN(MessageQueue);
 };
 
 }

=== modified file 'src/logic/player.h'
--- src/logic/player.h	2014-07-05 16:41:51 +0000
+++ src/logic/player.h	2014-07-14 19:24:49 +0000
@@ -20,6 +20,7 @@
 #ifndef WL_LOGIC_PLAYER_H
 #define WL_LOGIC_PLAYER_H
 
+#include "base/macros.h"
 #include "graphic/color.h"
 #include "logic/building.h"
 #include "logic/constants.h"
@@ -54,7 +55,6 @@
  * properly.
  */
 class Player :
-	boost::noncopyable,
 	public NoteReceiver<NoteImmovable>, public NoteReceiver<NoteFieldPossession>,
 	public NoteSender  <NoteImmovable>, public NoteSender  <NoteFieldPossession>
 {
@@ -140,7 +140,7 @@
 	};
 
 	/// Per-player field information.
-	struct Field : boost::noncopyable {
+	struct Field {
 		Field() :
 			military_influence(0),
 			vision            (0),
@@ -352,6 +352,7 @@
 		//  border_br
 		//  border_bl
 		//  <end>                           0x100         0x160
+		DISALLOW_COPY_AND_ASSIGN(Field);
 	};
 
 	const Field * fields() const {return m_fields;}
@@ -593,6 +594,8 @@
 	std::vector< std::vector<uint32_t> > m_ware_stocks;
 
 	BuildingStats m_building_stats;
+
+	DISALLOW_COPY_AND_ASSIGN(Player);
 };
 
 void find_former_buildings

=== modified file 'src/logic/production_program.h'
--- src/logic/production_program.h	2014-07-05 16:41:51 +0000
+++ src/logic/production_program.h	2014-07-14 19:24:49 +0000
@@ -26,11 +26,11 @@
 #include <string>
 #include <vector>
 
-#include <boost/noncopyable.hpp>
 #include <stdint.h>
 
 #include "base/deprecated.h"
 #include "base/log.h"
+#include "base/macros.h"
 #include "logic/bill_of_materials.h"
 #include "logic/program_result.h"
 #include "logic/tattribute.h"
@@ -52,7 +52,8 @@
 struct ProductionProgram {
 
 	/// Can be executed on a ProductionSite.
-	struct Action : boost::noncopyable {
+	struct Action {
+		Action() = default;
 		virtual ~Action();
 		virtual void execute(Game &, ProductionSite &) const = 0;
 
@@ -70,6 +71,8 @@
 		 * a failed status.
 		 */
 		virtual void building_work_failed(Game &, ProductionSite &, Worker &) const;
+
+		DISALLOW_COPY_AND_ASSIGN(Action);
 	};
 
 	/// A group of ware types with a count.

=== modified file 'src/logic/terrain_affinity.h'
--- src/logic/terrain_affinity.h	2014-07-06 08:25:05 +0000
+++ src/logic/terrain_affinity.h	2014-07-14 19:24:49 +0000
@@ -22,8 +22,7 @@
 
 #include <string>
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "logic/description_maintainer.h"
 
 class LuaTable;
@@ -38,7 +37,7 @@
 // Describes the parameters and the pickiness of Immovables towards terrain
 // parameters. Alls immovables that use 'grow' in any of their programs must
 // define this.
-class TerrainAffinity : boost::noncopyable {
+class TerrainAffinity {
 public:
 	explicit TerrainAffinity(const LuaTable& table, const std::string& immovable_name);
 
@@ -60,6 +59,8 @@
 	double preferred_humidity_;
 	double preferred_temperature_;
 	double pickiness_;
+
+	DISALLOW_COPY_AND_ASSIGN(TerrainAffinity);
 };
 
 // Returns a value in [0., 1.] that describes the suitability for the

=== modified file 'src/logic/tribe.h'
--- src/logic/tribe.h	2014-07-05 16:41:51 +0000
+++ src/logic/tribe.h	2014-07-14 19:24:49 +0000
@@ -23,6 +23,7 @@
 #include <map>
 #include <vector>
 
+#include "base/macros.h"
 #include "graphic/animation.h"
 #include "logic/bob.h"
 #include "logic/building.h"
@@ -51,7 +52,7 @@
 buildings it can build and the associated graphics.
 Two players can choose the same tribe.
 */
-struct Tribe_Descr : boost::noncopyable {
+struct Tribe_Descr {
 	Tribe_Descr(const std::string & name, Editor_Game_Base &);
 
 	//  Static function to check for tribes.
@@ -192,6 +193,8 @@
 	std::vector<Ware_Index> m_worker_types_without_cost;
 
 	std::vector<Initialization> m_initializations;
+
+	DISALLOW_COPY_AND_ASSIGN(Tribe_Descr);
 };
 
 }

=== modified file 'src/logic/world/editor_category.h'
--- src/logic/world/editor_category.h	2014-07-05 16:41:51 +0000
+++ src/logic/world/editor_category.h	2014-07-14 19:24:49 +0000
@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include <boost/noncopyable.hpp>
+#include "base/macros.h"
 
 class Image;
 class LuaTable;
@@ -31,7 +31,7 @@
 
 /// Represents a category for grouping items in the Editor, so purely a UI
 /// distinction and not a logical one.
-class EditorCategory : boost::noncopyable {
+class EditorCategory {
 public:
 	EditorCategory(const LuaTable& table);
 
@@ -48,6 +48,7 @@
 	const std::string name_;
 	const std::string descname_;
 	const std::string image_file_;
+	DISALLOW_COPY_AND_ASSIGN(EditorCategory);
 };
 
 }  // namespace Widelands

=== modified file 'src/logic/world/resource_description.h'
--- src/logic/world/resource_description.h	2014-07-05 16:41:51 +0000
+++ src/logic/world/resource_description.h	2014-07-14 19:24:49 +0000
@@ -23,15 +23,14 @@
 #include <string>
 #include <vector>
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "logic/widelands.h"
 
 class LuaTable;
 
 namespace Widelands {
 
-class ResourceDescription : boost::noncopyable {
+class ResourceDescription {
 public:
 	struct EditorPicture {
 		std::string picname;
@@ -62,6 +61,8 @@
 	const bool detectable_;
 	const int32_t max_amount_;
 	std::vector<EditorPicture> editor_pictures_;
+
+	DISALLOW_COPY_AND_ASSIGN(ResourceDescription);
 };
 
 }  // namespace Widelands

=== modified file 'src/logic/world/terrain_description.h'
--- src/logic/world/terrain_description.h	2014-07-06 08:17:24 +0000
+++ src/logic/world/terrain_description.h	2014-07-14 19:24:49 +0000
@@ -22,8 +22,7 @@
 
 #include <string>
 
-#include <boost/noncopyable.hpp>
-
+#include "base/macros.h"
 #include "logic/widelands.h"
 #include "logic/world/resource_description.h"
 
@@ -34,7 +33,7 @@
 class EditorCategory;
 class World;
 
-class TerrainDescription : boost::noncopyable {
+class TerrainDescription {
 public:
 	enum Type {
 		GREEN = 0,
@@ -107,6 +106,8 @@
 	double temperature_;
 	double fertility_;
 	double humidity_;
+
+	DISALLOW_COPY_AND_ASSIGN(TerrainDescription);
 };
 
 }  // namespace Widelands

=== modified file 'src/logic/world/world.h'
--- src/logic/world/world.h	2014-07-05 16:41:51 +0000
+++ src/logic/world/world.h	2014-07-14 19:24:49 +0000
@@ -22,6 +22,7 @@
 
 #include <memory>
 
+#include "base/macros.h"
 #include "logic/bob.h"
 #include "logic/description_maintainer.h"
 
@@ -36,7 +37,7 @@
 
 /// This is the in memory descriptions of the world and provides access to
 /// terrains, immovables and resources.
-class World : boost::noncopyable {
+class World {
 public:
 	World();
 	~World();  // Defined in .cc because all forward declarations are known then.
@@ -89,6 +90,8 @@
 	std::unique_ptr<DescriptionMaintainer<ResourceDescription>> resources_;
 	std::unique_ptr<DescriptionMaintainer<EditorCategory>> editor_terrain_categories_;
 	std::unique_ptr<DescriptionMaintainer<EditorCategory>> editor_immovable_categories_;
+
+	DISALLOW_COPY_AND_ASSIGN(World);
 };
 
 }  // namespace Widelands

=== modified file 'src/map_io/one_world_legacy_lookup_table.h'
--- src/map_io/one_world_legacy_lookup_table.h	2014-07-05 16:41:51 +0000
+++ src/map_io/one_world_legacy_lookup_table.h	2014-07-14 19:24:49 +0000
@@ -24,10 +24,11 @@
 #include <memory>
 #include <string>
 
-#include <boost/noncopyable.hpp>
+#include "base/macros.h"
 
-class OneWorldLegacyLookupTable : boost::noncopyable {
+class OneWorldLegacyLookupTable {
 public:
+	OneWorldLegacyLookupTable() = default;
 	virtual ~OneWorldLegacyLookupTable();
 
 	/// Looks up the new name for the 'resource'.
@@ -41,6 +42,8 @@
 
 	/// Looks up the new name for the 'immovable'.
 	virtual std::string lookup_immovable(const std::string& immovable) const = 0;
+
+	DISALLOW_COPY_AND_ASSIGN(OneWorldLegacyLookupTable);
 };
 
 std::unique_ptr<OneWorldLegacyLookupTable>

=== modified file 'src/map_io/s2map.cc'
--- src/map_io/s2map.cc	2014-07-05 14:22:44 +0000
+++ src/map_io/s2map.cc	2014-07-14 19:24:49 +0000
@@ -229,7 +229,7 @@
 /// Returns S2 terrain index into (pre one-world) terrain names. Those are then
 /// looked up in the legacy conversion code and this gives the Widelands
 /// terrain.
-class TerrainConverter : boost::noncopyable {
+class TerrainConverter {
 public:
 	TerrainConverter(const Widelands::World& world, const OneWorldLegacyLookupTable& lookup_table);
 	Widelands::Terrain_Index lookup(S2_Map_Loader::WorldType world, int8_t c) const;
@@ -238,6 +238,8 @@
 	const OneWorldLegacyLookupTable& one_world_legacy_lookup_table_;
 	const Widelands::World& world_;
 	const std::map<S2_Map_Loader::WorldType, std::vector<std::string>> table_;
+
+	DISALLOW_COPY_AND_ASSIGN(TerrainConverter);
 };
 
 TerrainConverter::TerrainConverter

=== modified file 'src/map_io/s2map.h'
--- src/map_io/s2map.h	2014-07-05 16:41:51 +0000
+++ src/map_io/s2map.h	2014-07-14 19:24:49 +0000
@@ -22,6 +22,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "map_io/map_loader.h"
 
 class FileRead;

=== modified file 'src/profile/profile.h'
--- src/profile/profile.h	2014-07-05 16:41:51 +0000
+++ src/profile/profile.h	2014-07-14 19:24:49 +0000
@@ -23,8 +23,6 @@
 #include <cstring>
 #include <vector>
 
-#include <boost/noncopyable.hpp>
-
 #include "base/macros.h"
 #include "base/point.h"
 #include "io/filesystem/layered_filesystem.h"
@@ -188,7 +186,7 @@
  * Returns the next unused section of the given name, or 0 if all sections
  * have been used. name can be 0 to retrieve any remaining sections.
  */
-class Profile : boost::noncopyable {
+class Profile {
 public:
 	enum {
 		err_ignore = 0,
@@ -237,6 +235,8 @@
 	typedef std::vector<Section> Section_list;
 	Section_list m_sections;
 	int32_t m_error_level;
+
+	DISALLOW_COPY_AND_ASSIGN(Profile);
 };
 
 #endif  // end of include guard: WL_PROFILE_PROFILE_H

=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2014-07-13 14:36:19 +0000
+++ src/ui_basic/panel.h	2014-07-14 19:24:49 +0000
@@ -27,9 +27,9 @@
 #include <string>
 
 #include <SDL_keyboard.h>
-#include <boost/noncopyable.hpp>
 #include <boost/signals2/trackable.hpp>
 
+#include "base/macros.h"
 #include "base/point.h"
 
 class RenderTarget;
@@ -57,7 +57,7 @@
  * its desired size changes, this automatically changes the actual size (which then invokes
  * \ref layout and \ref move_inside_parent).
  */
-struct Panel : boost::signals2::trackable, boost::noncopyable {
+struct Panel : boost::signals2::trackable {
 	enum {
 		pf_handle_mouse = 1, ///< receive mouse events
 		pf_think = 2, ///< call think() function during run
@@ -305,6 +305,8 @@
 	static bool _g_allow_user_input;
 	static const Image* s_default_cursor;
 	static const Image* s_default_cursor_click;
+
+	DISALLOW_COPY_AND_ASSIGN(Panel);
 };
 
 inline void Panel::set_snap_windows_only_when_overlapping(const bool on) {

=== modified file 'src/ui_basic/unique_window.h'
--- src/ui_basic/unique_window.h	2014-07-05 16:41:51 +0000
+++ src/ui_basic/unique_window.h	2014-07-14 19:24:49 +0000
@@ -22,8 +22,6 @@
 
 #include <functional>
 
-#include "boost/noncopyable.hpp"
-
 #include "ui_basic/button.h"
 #include "ui_basic/window.h"