Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 16:38:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Build fix for VS 2013

Browse Source
This commit is contained in:
Shauren
2015-08-14 19:36:25 +02:00
parent 57624e0d53
commit 89a8a7e1a4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Entities/Object/ObjectGuid.h
View File

@@ -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);

3
src/server/game/Entities/Player/Player.h
View File

@@ -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;