diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-03-08 22:04:34 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-03-08 22:04:34 +0100 |
| commit | e15ba34444b4484cebbe2070e0f205ccf9c69a16 (patch) | |
| tree | 47560de814f2112b3adc6162bc7ac0559608b5fc /src/server/shared | |
| parent | 75f0cabde74ed491bfe1545d2291f6ce28993ccf (diff) | |
Core/Misc: Cleaned up data truncation warnings
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/Containers.h | 4 | ||||
| -rw-r--r-- | src/server/shared/Database/DatabaseWorkerPool.h | 2 | ||||
| -rw-r--r-- | src/server/shared/Packets/ByteBuffer.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/server/shared/Containers.h b/src/server/shared/Containers.h index 58379e1fefa..5dee18cb752 100644 --- a/src/server/shared/Containers.h +++ b/src/server/shared/Containers.h @@ -31,7 +31,7 @@ namespace Trinity template<class T> void RandomResizeList(std::list<T> &list, uint32 size) { - size_t list_size = list.size(); + uint32 list_size = uint32(list.size()); while (list_size > size) { @@ -61,7 +61,7 @@ namespace Trinity template <class C> typename C::value_type const& SelectRandomContainerElement(C const& container) { typename C::const_iterator it = container.begin(); - std::advance(it, urand(0, container.size() - 1)); + std::advance(it, urand(0, uint32(container.size()) - 1)); return *it; } diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index f0ddbe91ad8..f1c6a7acbf5 100644 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -434,7 +434,7 @@ class DatabaseWorkerPool return; char* buf = new char[str.size() * 2 + 1]; - EscapeString(buf, str.c_str(), str.size()); + EscapeString(buf, str.c_str(), uint32(str.length())); str = buf; delete[] buf; } diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 8efaf7efccb..4ac35c9feeb 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -196,16 +196,16 @@ class ByteBuffer return ((_curbitval >> (7-_bitpos)) & 1) != 0; } - template <typename T> void WriteBits(T value, size_t bits) + template <typename T> void WriteBits(T value, int32 bits) { - for (int32 i = bits-1; i >= 0; --i) + for (int32 i = bits - 1; i >= 0; --i) WriteBit((value >> i) & 1); } - uint32 ReadBits(size_t bits) + uint32 ReadBits(int32 bits) { uint32 value = 0; - for (int32 i = bits-1; i >= 0; --i) + for (int32 i = bits - 1; i >= 0; --i) if (ReadBit()) value |= (1 << (i)); |
