From 70412e7e254a36398f101b4bfe1926c619063202 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 5 Apr 2016 00:15:56 +0200 Subject: Core/Misc: MSVC warning fixes --- src/server/database/Database/DatabaseWorkerPool.cpp | 2 +- src/server/database/Database/Field.h | 2 +- src/server/database/Database/PreparedStatement.cpp | 2 +- src/server/database/Database/QueryResult.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/database/Database') diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp index daf54d271b2..88c2483b2b2 100644 --- a/src/server/database/Database/DatabaseWorkerPool.cpp +++ b/src/server/database/Database/DatabaseWorkerPool.cpp @@ -234,7 +234,7 @@ void DatabaseWorkerPool::EscapeString(std::string& str) return; char* buf = new char[str.size() * 2 + 1]; - EscapeString(buf, str.c_str(), str.size()); + EscapeString(buf, str.c_str(), uint32(str.size())); str = buf; delete[] buf; } diff --git a/src/server/database/Database/Field.h b/src/server/database/Database/Field.h index cd05023f417..6089c3001fb 100644 --- a/src/server/database/Database/Field.h +++ b/src/server/database/Database/Field.h @@ -333,7 +333,7 @@ class TC_DATABASE_API Field data.value = NULL; } - static size_t SizeForType(MYSQL_FIELD* field) + static uint32 SizeForType(MYSQL_FIELD* field) { switch (field->type) { diff --git a/src/server/database/Database/PreparedStatement.cpp b/src/server/database/Database/PreparedStatement.cpp index e6f813c70c1..d32b3306995 100644 --- a/src/server/database/Database/PreparedStatement.cpp +++ b/src/server/database/Database/PreparedStatement.cpp @@ -357,7 +357,7 @@ void MySQLPreparedStatement::setBinary(const uint8 index, const std::vectorbuffer_type = MYSQL_TYPE_BLOB; delete [] static_cast(param->buffer); param->buffer = new char[len]; diff --git a/src/server/database/Database/QueryResult.cpp b/src/server/database/Database/QueryResult.cpp index 46ba4a9258e..44f29ce41b8 100644 --- a/src/server/database/Database/QueryResult.cpp +++ b/src/server/database/Database/QueryResult.cpp @@ -76,7 +76,7 @@ m_length(NULL) std::size_t rowSize = 0; for (uint32 i = 0; i < m_fieldCount; ++i) { - size_t size = Field::SizeForType(&field[i]); + uint32 size = Field::SizeForType(&field[i]); rowSize += size; m_rBind[i].buffer_type = field[i].type; -- cgit v1.2.3