Map/Label: use default move ctor on compilers other than MSVC 2013

wesnoth · Aug 28, 2017 · 8c8f109 · 8c8f109
1 parent 45c8c25
commit 8c8f109
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/map/label.cpp b/src/map/label.cpp
@@ -351,6 +351,7 @@ terrain_label::terrain_label(const map_labels& parent, const config& cfg)
 	read(cfg);
 }
 
+#if defined(_MSC_VER) && _MSC_VER < 1900
 terrain_label::terrain_label(terrain_label&& l)
 	: handle_(l.handle_)
 	, tooltip_handle_(l.tooltip_handle_)
@@ -369,6 +370,7 @@ terrain_label::terrain_label(terrain_label&& l)
 	l.handle_ = 0;
 	l.tooltip_handle_ = 0;
 }
+#endif
 
 terrain_label::~terrain_label()
 {

diff --git a/src/map/label.hpp b/src/map/label.hpp
@@ -126,7 +126,11 @@ class terrain_label
 	terrain_label(const map_labels&, const config&);
 
 	/** Move ctor. */
+#if defined(_MSC_VER) && _MSC_VER < 1900
 	terrain_label(terrain_label&&);
+#else
+	terrain_label(terrain_label&&) = default;
+#endif
 
 	~terrain_label();