diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-04-17 09:46:20 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-04-17 09:46:20 +1000 |
| commit | 8c45e7db05d76de60d214148a69b5ba927b704a1 (patch) | |
| tree | b9727f9b4ea6ed4ce2af7898aacc326ccc0e6893 /win32 | |
| parent | 354b184054b43184961a254ea795c6bad4aafcb5 (diff) | |
| download | scintilla-mirror-8c45e7db05d76de60d214148a69b5ba927b704a1.tar.gz | |
Arithmetic between enums is deprecated so use constexpr instead of enum or cast.
Added constexpr where reasonable.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/ScintillaWin.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 90af4494b..51563f494 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1714,7 +1714,7 @@ sptr_t ScintillaWin::IdleMessage(unsigned int iMessage, uptr_t wParam, sptr_t lP #endif const DWORD dwCurrent = GetTickCount(); const DWORD dwStart = wParam ? static_cast<DWORD>(wParam) : dwCurrent; - const DWORD maxWorkTime = 50; + constexpr DWORD maxWorkTime = 50; if (dwCurrent >= dwStart && dwCurrent > maxWorkTime &&dwCurrent - maxWorkTime < dwStart) PostMessage(MainHWND(), SC_WIN_IDLE, dwStart, 0); @@ -1991,10 +1991,11 @@ bool ScintillaWin::FineTickerRunning(TickReason reason) { void ScintillaWin::FineTickerStart(TickReason reason, int millis, int tolerance) { FineTickerCancel(reason); + const UINT_PTR eventID = static_cast<UINT_PTR>(fineTimerStart) + reason; if (SetCoalescableTimerFn && tolerance) { - timers[reason] = SetCoalescableTimerFn(MainHWND(), fineTimerStart + reason, millis, nullptr, tolerance); + timers[reason] = SetCoalescableTimerFn(MainHWND(), eventID, millis, nullptr, tolerance); } else { - timers[reason] = ::SetTimer(MainHWND(), fineTimerStart + reason, millis, nullptr); + timers[reason] = ::SetTimer(MainHWND(), eventID, millis, nullptr); } } |