diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-07-20 13:27:04 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-07-20 13:27:04 +0200 |
| commit | e405ac5f4100cf9e544b80cf4503b107ecee8d50 (patch) | |
| tree | 155db121e093b757a215698639393841bbacb8f2 /src/server/shared/DataStores | |
| parent | 420d096b6a477856979e2810a8f68d38cbce3349 (diff) | |
Fixed nopch build and some leftover warnings
Diffstat (limited to 'src/server/shared/DataStores')
| -rw-r--r-- | src/server/shared/DataStores/DB2SparseStorageLoader.cpp | 1 | ||||
| -rw-r--r-- | src/server/shared/DataStores/DB2StorageLoader.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/server/shared/DataStores/DB2SparseStorageLoader.cpp b/src/server/shared/DataStores/DB2SparseStorageLoader.cpp index 5a2fbfeae73..5b93d588965 100644 --- a/src/server/shared/DataStores/DB2SparseStorageLoader.cpp +++ b/src/server/shared/DataStores/DB2SparseStorageLoader.cpp @@ -206,7 +206,6 @@ static char const* const nullStr = ""; char* DB2SparseFileLoader::AutoProduceData(IndexTable const& indexTable, uint32 locale, std::vector<char*>& stringPool) { - typedef char* ptr; if (meta->FieldCount != fieldCount) return NULL; diff --git a/src/server/shared/DataStores/DB2StorageLoader.cpp b/src/server/shared/DataStores/DB2StorageLoader.cpp index 3515d77a586..e1f02a350af 100644 --- a/src/server/shared/DataStores/DB2StorageLoader.cpp +++ b/src/server/shared/DataStores/DB2StorageLoader.cpp @@ -168,7 +168,7 @@ bool DB2FileLoader::Load(char const* filename, DB2Meta const* meta) EndianConvert(metaFlags); ASSERT((metaFlags & 0x1) == 0, "%s is a sparse storage, use DB2SparseStorage!", filename); - ASSERT((meta->IndexField == -1) || (meta->IndexField == (metaFlags >> 16))); + ASSERT((meta->IndexField == -1) || (meta->IndexField == int32(metaFlags >> 16))); fields = new FieldEntry[fieldCount]; if (fread(fields, fieldCount * sizeof(FieldEntry), 1, f) != 1) |