diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-04-29 19:39:40 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-04-29 19:39:40 +0200 |
| commit | f9a6aa5479dc843f7bb8b58d027b5d6d483d3fd5 (patch) | |
| tree | f45262b22a888300024b62c2fa4154eceed2e2bd /src/server/shared/DataStores | |
| parent | 1896b5cb5996e0f6e31c3693035257ac6d410392 (diff) | |
| parent | 24ae6a6802da5fc3f90b075d21cd4275e7138441 (diff) | |
Merge pull request #11950 from Dehravor/override-final-delete
Core/Misc: Remove obsolete C++11 backward compatibility macros
Diffstat (limited to 'src/server/shared/DataStores')
| -rw-r--r-- | src/server/shared/DataStores/DBCFileLoader.h | 4 | ||||
| -rw-r--r-- | src/server/shared/DataStores/DBCStore.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h index f26e07f8b50..a665bc49c9c 100644 --- a/src/server/shared/DataStores/DBCFileLoader.h +++ b/src/server/shared/DataStores/DBCFileLoader.h @@ -107,7 +107,7 @@ class DBCFileLoader unsigned char *data; unsigned char *stringTable; - DBCFileLoader(DBCFileLoader const& right) DELETE_MEMBER; - DBCFileLoader& operator=(DBCFileLoader const& right) DELETE_MEMBER; + DBCFileLoader(DBCFileLoader const& right) = delete; + DBCFileLoader& operator=(DBCFileLoader const& right) = delete; }; #endif diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h index b337fb4be59..08b8d810b8b 100644 --- a/src/server/shared/DataStores/DBCStore.h +++ b/src/server/shared/DataStores/DBCStore.h @@ -65,8 +65,8 @@ struct SqlDbc } private: - SqlDbc(SqlDbc const& right) DELETE_MEMBER; - SqlDbc& operator=(SqlDbc const& right) DELETE_MEMBER; + SqlDbc(SqlDbc const& right) = delete; + SqlDbc& operator=(SqlDbc const& right) = delete; }; template<class T> @@ -296,8 +296,8 @@ class DBCStorage T* dataTable; StringPoolList stringPoolList; - DBCStorage(DBCStorage const& right) DELETE_MEMBER; - DBCStorage& operator=(DBCStorage const& right) DELETE_MEMBER; + DBCStorage(DBCStorage const& right) = delete; + DBCStorage& operator=(DBCStorage const& right) = delete; }; #endif |