aboutsummaryrefslogtreecommitdiff
path: root/src/server/database/Database
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-04-05 00:15:56 +0200
committerShauren <shauren.trinity@gmail.com>2016-04-05 00:15:56 +0200
commit70412e7e254a36398f101b4bfe1926c619063202 (patch)
tree1a49d68aeaae5ca2869c37014a5d688ee37fda74 /src/server/database/Database
parente3acb2ecc76910155878116a92795480df7f8d73 (diff)
Core/Misc: MSVC warning fixes
Diffstat (limited to 'src/server/database/Database')
-rw-r--r--src/server/database/Database/DatabaseWorkerPool.cpp2
-rw-r--r--src/server/database/Database/Field.h2
-rw-r--r--src/server/database/Database/PreparedStatement.cpp2
-rw-r--r--src/server/database/Database/QueryResult.cpp2
4 files changed, 4 insertions, 4 deletions
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<T>::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::vector<uint
CheckValidIndex(index);
m_paramsSet[index] = true;
MYSQL_BIND* param = &m_bind[index];
- size_t len = value.size();
+ uint32 len = uint32(value.size());
param->buffer_type = MYSQL_TYPE_BLOB;
delete [] static_cast<char *>(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;