diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-08-14 19:36:25 +0200 | 
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-08-14 19:36:25 +0200 | 
| commit | 89a8a7e1a4bdc22d2da17b1a3bf34fd52bf87e85 (patch) | |
| tree | 7529ba6cacd52211fa28aaab336a1ea28a9d1e5e /src | |
| parent | 57624e0d53b8a39574454e5fb7f196b807088ae4 (diff) | |
Core/Misc: Build fix for VS 2013
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Object/ObjectGuid.h | 8 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 3 | 
2 files changed, 6 insertions, 5 deletions
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<ObjectGuidTraits<type>::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<uint8> GetRawValue() const;          void SetRawValue(std::vector<uint8> 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;  | 
