From 5dfc62a244a8ca24efb9ce9cb51c1098e908a9a8 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 17 Apr 2020 09:46:20 +1000 Subject: Backport: Arithmetic between enums is deprecated so use constexpr instead of enum or cast. Added constexpr where reasonable. Backport of changeset 8151:5f70c1eb371b. --- win32/ScintillaWin.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'win32') diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 8c5e2bc0d..1c854a19a 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1704,7 +1704,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(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); @@ -1967,10 +1967,11 @@ bool ScintillaWin::FineTickerRunning(TickReason reason) { void ScintillaWin::FineTickerStart(TickReason reason, int millis, int tolerance) { FineTickerCancel(reason); + const UINT_PTR eventID = static_cast(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); } } -- cgit v1.2.3