From 7360d68eb77a82b991a7345ff870e0a973ebd9c3 Mon Sep 17 00:00:00 2001 From: tomy2105 Date: Tue, 15 Mar 2016 14:21:50 +0100 Subject: [PATCH 1/2] Fixing default VS2013 "default"s Fixing VS2013 versions of "default" move constructor and assignment operator --- tz.h | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tz.h b/tz.h index 221f418..6c1ce71 100644 --- a/tz.h +++ b/tz.h @@ -208,7 +208,7 @@ public: Zone(Zone&& src) : name_(std::move(src.name_)), - zonelets_(std::move(zonelets_)) + zonelets_(std::move(src.zonelets_)) {} Zone& operator=(Zone&& src) @@ -582,26 +582,28 @@ struct TZ_DB #else // defined(_MSC_VER) || (_MSC_VER >= 1900) TZ_DB(TZ_DB&& src) : + version(std::move(src.version)), zones(std::move(src.zones)), - links(std::move(links)), - leaps(std::move(leaps)), - rules(std::move(rules)) + links(std::move(src.links)), + leaps(std::move(src.leaps)), + rules(std::move(src.rules)) #if TIMEZONE_MAPPING , - mappings(std::move(mappings)), - native_zones(std::move(native_zones)) + mappings(std::move(src.mappings)), + native_zones(std::move(src.native_zones)) #endif {} TZ_DB& operator=(TZ_DB&& src) { + version = std::move(src.version); zones = std::move(src.zones); - links = std::move(links); - leaps = std::move(leaps); - rules = std::move(rules); + links = std::move(src.links); + leaps = std::move(src.leaps); + rules = std::move(src.rules); #if TIMEZONE_MAPPING - mappings = std::move(mappings); - native_zones = std::move(native_zones); + mappings = std::move(src.mappings); + native_zones = std::move(src.native_zones); #endif return *this; } From 644291ce1ba42860c7ba785826f2121afe7b314d Mon Sep 17 00:00:00 2001 From: tomy2105 Date: Tue, 15 Mar 2016 14:29:26 +0100 Subject: [PATCH 2/2] Fixing tabs Fixing leading tabs from previous commit. --- tz.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tz.h b/tz.h index 6c1ce71..e44851f 100644 --- a/tz.h +++ b/tz.h @@ -208,7 +208,7 @@ public: Zone(Zone&& src) : name_(std::move(src.name_)), - zonelets_(std::move(src.zonelets_)) + zonelets_(std::move(src.zonelets_)) {} Zone& operator=(Zone&& src) @@ -582,28 +582,28 @@ struct TZ_DB #else // defined(_MSC_VER) || (_MSC_VER >= 1900) TZ_DB(TZ_DB&& src) : - version(std::move(src.version)), + version(std::move(src.version)), zones(std::move(src.zones)), - links(std::move(src.links)), - leaps(std::move(src.leaps)), - rules(std::move(src.rules)) + links(std::move(src.links)), + leaps(std::move(src.leaps)), + rules(std::move(src.rules)) #if TIMEZONE_MAPPING , - mappings(std::move(src.mappings)), - native_zones(std::move(src.native_zones)) + mappings(std::move(src.mappings)), + native_zones(std::move(src.native_zones)) #endif {} TZ_DB& operator=(TZ_DB&& src) { - version = std::move(src.version); + version = std::move(src.version); zones = std::move(src.zones); - links = std::move(src.links); - leaps = std::move(src.leaps); - rules = std::move(src.rules); + links = std::move(src.links); + leaps = std::move(src.leaps); + rules = std::move(src.rules); #if TIMEZONE_MAPPING - mappings = std::move(src.mappings); - native_zones = std::move(src.native_zones); + mappings = std::move(src.mappings); + native_zones = std::move(src.native_zones); #endif return *this; }