Core/Misc: Warning fixes (/W4)

This commit is contained in:
Shauren
2016-05-11 16:52:39 +02:00
parent cccdbf4755
commit c9ba5ce591
2 changed files with 6 additions and 6 deletions

View File

@@ -78,8 +78,8 @@ public:
BlackMarketTemplate const* GetTemplate() const;
int32 GetMarketId() const { return _marketId; }
uint32 GetCurrentBid() const { return _currentBid; }
void SetCurrentBid(uint32 bid) { _currentBid = bid; }
uint64 GetCurrentBid() const { return _currentBid; }
void SetCurrentBid(uint64 bid) { _currentBid = bid; }
int32 GetNumBids() const { return _numBids; }
void SetNumBids(int32 numBids) { _numBids = numBids; }

View File

@@ -126,9 +126,9 @@ class TC_GAME_API MapManager
template<typename Worker>
void DoForAllMapsWithMapId(uint32 mapId, Worker&& worker);
uint32 IncreaseScheduledScriptsCount() { return ++_scheduledScripts; }
uint32 DecreaseScheduledScriptCount() { return --_scheduledScripts; }
uint32 DecreaseScheduledScriptCount(size_t count) { return _scheduledScripts -= count; }
void IncreaseScheduledScriptsCount() { ++_scheduledScripts; }
void DecreaseScheduledScriptCount() { --_scheduledScripts; }
void DecreaseScheduledScriptCount(std::size_t count) { _scheduledScripts -= count; }
bool IsScriptScheduled() const { return _scheduledScripts > 0; }
private:
@@ -157,7 +157,7 @@ class TC_GAME_API MapManager
MapUpdater m_updater;
// atomic op counter for active scripts amount
std::atomic<uint32> _scheduledScripts;
std::atomic<std::size_t> _scheduledScripts;
};
template<typename Worker>