diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-08-21 16:56:11 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-08-23 19:56:41 +0200 |
| commit | 7fe7f30521503559dc8aee9f3127e11111f8ccc4 (patch) | |
| tree | f4a75f563e89957d43cef93253bfc300ecf57339 /src/server/shared/Utilities | |
| parent | f5f9df0483fbf847eb9ee4e6ec4ecc6cf66d3a47 (diff) | |
Core/Misc: Fix some -Wconversion warnings
Diffstat (limited to 'src/server/shared/Utilities')
| -rw-r--r-- | src/server/shared/Utilities/Timer.h | 2 | ||||
| -rw-r--r-- | src/server/shared/Utilities/Util.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h index 7c62de5f5ed..0e2d6ddbff5 100644 --- a/src/server/shared/Utilities/Timer.h +++ b/src/server/shared/Utilities/Timer.h @@ -27,7 +27,7 @@ inline uint32 getMSTime() { static const system_clock::time_point ApplicationStartTime = system_clock::now(); - return duration_cast<milliseconds>(system_clock::now() - ApplicationStartTime).count(); + return uint32(duration_cast<milliseconds>(system_clock::now() - ApplicationStartTime).count()); } inline uint32 getMSTimeDiff(uint32 oldMSTime, uint32 newMSTime) diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index 0680b91e0fe..20c17b14023 100644 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -618,7 +618,7 @@ class EventMap if (!phase) _phase = 0; else if (phase <= 8) - _phase = (1 << (phase - 1)); + _phase = uint8(1 << (phase - 1)); } /** @@ -629,7 +629,7 @@ class EventMap void AddPhase(uint8 phase) { if (phase && phase <= 8) - _phase |= (1 << (phase - 1)); + _phase |= uint8(1 << (phase - 1)); } /** @@ -640,7 +640,7 @@ class EventMap void RemovePhase(uint8 phase) { if (phase && phase <= 8) - _phase &= ~(1 << (phase - 1)); + _phase &= uint8(~(1 << (phase - 1))); } /** |