diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-09-02 19:58:44 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2016-09-02 19:58:44 +0200 |
| commit | 65667e7cc2f741afdfcfaad40f57d8cab5254633 (patch) | |
| tree | 92244ff2510d213662fa5c4845392bba1deddd5a /src | |
| parent | f673caf8a89c4d9b8b631e46d20c71118a29eb9c (diff) | |
Fix Windows build and most MSVC warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/coremods/core_stats.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_cap.cpp | 3 | ||||
| -rw-r--r-- | src/modules/m_clearchan.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp index ee0c50db2..a282089e3 100644 --- a/src/coremods/core_stats.cpp +++ b/src/coremods/core_stats.cpp @@ -307,7 +307,7 @@ void CommandStats::DoStats(Stats::Context& stats) n_eaten = (double)(( (uint64_t)(KernelTime.dwHighDateTime) << 32 ) + (uint64_t)(KernelTime.dwLowDateTime))/100000; per = (n_eaten / n_elapsed); snprintf(percent, 30, "%03.5f%%", per); - stats.AddRow(249, std::string("CPU Use (total): ")+percent)); + stats.AddRow(249, std::string("CPU Use (total): ")+percent); } #endif } diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index e6e01570d..868294fe4 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -55,7 +55,8 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener static bool CanRequest(LocalUser* user, Ext usercaps, Capability* cap, bool adding) { - if ((usercaps & cap->GetMask()) == adding) + const bool hascap = ((usercaps & cap->GetMask()) != 0); + if (hascap == adding) return true; return cap->OnRequest(user, adding); diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp index 5fcec36f1..4142f81d1 100644 --- a/src/modules/m_clearchan.cpp +++ b/src/modules/m_clearchan.cpp @@ -119,7 +119,7 @@ class CommandClearChan : public Command mask = ((method[0] == 'Z') ? curr->GetIPString() : "*@" + curr->host); xline = xlf->Generate(ServerInstance->Time(), 60*60, user->nick, reason, mask); } - catch (ModuleException& ex) + catch (ModuleException&) { // Nothing, move on to the next user continue; |