diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-20 22:54:39 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-20 22:54:39 +0200 |
| commit | 81c99b333826d6055932aef8a93c128cadb806ba (patch) | |
| tree | f684897696c25d64e10901f54f21b45cd16870a3 /src/server/shared/Define.h | |
| parent | 40a29a3c99412b18b96341cefefb76bd9407531a (diff) | |
| parent | e25416ee2346fd361d47ef6873814b67d7086ea0 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/tools/map_extractor/dbcfile.h
src/tools/vmap4_extractor/adtfile.cpp
src/tools/vmap4_extractor/adtfile.h
src/tools/vmap4_extractor/loadlib/loadlib.h
Diffstat (limited to 'src/server/shared/Define.h')
| -rw-r--r-- | src/server/shared/Define.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index a7fbfda641c..68ce6c6d6b4 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -73,9 +73,11 @@ #if COMPILER_HAS_CPP11_SUPPORT # define OVERRIDE override # define FINAL final +# define DELETE_MEMBER = delete #else # define OVERRIDE # define FINAL +# define DELETE_MEMBER #endif //COMPILER_HAS_CPP11_SUPPORT #define UI64FMTD ACE_UINT64_FORMAT_SPECIFIER |