From 8c8f109c56107e4b728f8abd5ba668b374f57f67 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Mon, 28 Aug 2017 12:50:36 +1100 Subject: [PATCH] Map/Label: use default move ctor on compilers other than MSVC 2013 --- src/map/label.cpp | 2 ++ src/map/label.hpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/map/label.cpp b/src/map/label.cpp index 83a20341af16..8af9f40b1d9f 100644 --- 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 index 06fab5272cd8..7ce73a398654 100644 --- 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();