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/DataStores | |
| 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/DataStores')
| -rw-r--r-- | src/server/shared/DataStores/DBCFileLoader.h | 3 | ||||
| -rw-r--r-- | src/server/shared/DataStores/DBCStore.h | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h index 0084e3b9381..fac6ef4eef0 100644 --- a/src/server/shared/DataStores/DBCFileLoader.h +++ b/src/server/shared/DataStores/DBCFileLoader.h @@ -91,5 +91,8 @@ class DBCFileLoader uint32 *fieldsOffset; unsigned char *data; unsigned char *stringTable; + + DBCFileLoader(DBCFileLoader const& right) DELETE_MEMBER; + DBCFileLoader& operator=(DBCFileLoader const& right) DELETE_MEMBER; }; #endif diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h index 5f252318c8d..198f64c5ebf 100644 --- a/src/server/shared/DataStores/DBCStore.h +++ b/src/server/shared/DataStores/DBCStore.h @@ -63,6 +63,10 @@ struct SqlDbc } } } + +private: + SqlDbc(SqlDbc const& right) DELETE_MEMBER; + SqlDbc& operator=(SqlDbc const& right) DELETE_MEMBER; }; template<class T> @@ -291,6 +295,9 @@ class DBCStorage T* dataTable; StringPoolList stringPoolList; + + DBCStorage(DBCStorage const& right) DELETE_MEMBER; + DBCStorage& operator=(DBCStorage const& right) DELETE_MEMBER; }; #endif |