From 31cf5ea305c471b8086f582879c25f9fa9777005 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 27 Oct 2015 22:55:57 +0100 Subject: Core/Misc: Removed manually defined ObjectGuid copy/move constructors. This will cause the compiler to automatically generate trivial constructors allowing them to be treated as simple integers (cherry picked from commit 3fd15ed22a23af1c5bb2cf037f93c1bce5f1e243) --- src/server/game/Entities/Object/ObjectGuid.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h index 697ee3835f6..372a31307d9 100644 --- a/src/server/game/Entities/Object/ObjectGuid.h +++ b/src/server/game/Entities/Object/ObjectGuid.h @@ -130,11 +130,6 @@ class ObjectGuid explicit ObjectGuid(uint64 guid) : _guid(guid) { } ObjectGuid(HighGuid hi, uint32 entry, LowType counter) : _guid(counter ? uint64(counter) | (uint64(entry) << 24) | (uint64(hi) << 48) : 0) { } ObjectGuid(HighGuid hi, LowType counter) : _guid(counter ? uint64(counter) | (uint64(hi) << 48) : 0) { } - ObjectGuid(ObjectGuid const& r) : _guid(r._guid) { } - ObjectGuid(ObjectGuid&& r) : _guid(r._guid) { } - - ObjectGuid& operator=(ObjectGuid const& r) { _guid = r._guid; return *this; } - ObjectGuid& operator=(ObjectGuid&& r) { _guid = r._guid; return *this; } operator uint64() const { return _guid; } PackedGuidReader ReadAsPacked() { return PackedGuidReader(*this); } -- cgit v1.2.3