From 89a8a7e1a4bdc22d2da17b1a3bf34fd52bf87e85 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 14 Aug 2015 19:36:25 +0200 Subject: Core/Misc: Build fix for VS 2013 --- src/server/game/Entities/Object/ObjectGuid.h | 8 ++++---- src/server/game/Entities/Player/Player.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h index 9b1c2516c18..fcfa0b5a810 100644 --- a/src/server/game/Entities/Object/ObjectGuid.h +++ b/src/server/game/Entities/Object/ObjectGuid.h @@ -204,11 +204,11 @@ class ObjectGuid static typename std::enable_if::MapSpecific, ObjectGuid>::type Create(uint16 mapId, uint32 entry, LowType counter) { return MapSpecific(type, 0, mapId, 0, entry, counter); } ObjectGuid() : _low(0), _high(0) { } - ObjectGuid(ObjectGuid const&) = default; - ObjectGuid(ObjectGuid&&) = default; + ObjectGuid(ObjectGuid const& r) : _low(r._low), _high(r._high) { } + ObjectGuid(ObjectGuid&& r) : _low(r._low), _high(r._high) { } - ObjectGuid& operator=(ObjectGuid const&) = default; - ObjectGuid& operator=(ObjectGuid&&) = default; + ObjectGuid& operator=(ObjectGuid const& r) { _low = r._low; _high = r._high; return *this; } + ObjectGuid& operator=(ObjectGuid&& r) { _low = r._low; _high = r._high; return *this; } std::vector GetRawValue() const; void SetRawValue(std::vector const& guid); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 4167c632668..83f60d64352 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1169,7 +1169,8 @@ struct VoidStorageItem { BonusListIDs.insert(BonusListIDs.end(), bonuses.begin(), bonuses.end()); } - VoidStorageItem(VoidStorageItem&& vsi) = default; + VoidStorageItem(VoidStorageItem&& vsi) : ItemId(vsi.ItemId), ItemEntry(vsi.ItemEntry), CreatorGuid(vsi.CreatorGuid), ItemRandomPropertyId(vsi.ItemRandomPropertyId), + ItemSuffixFactor(vsi.ItemSuffixFactor), ItemUpgradeId(vsi.ItemUpgradeId), BonusListIDs(std::move(vsi.BonusListIDs)) { } uint64 ItemId; uint32 ItemEntry; -- cgit v1.2.3