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 | 5dfc62a244a8ca24efb9ce9cb51c1098e908a9a8 (patch) | |
| tree | a0578605a3c17ce144db2c4ce2823d2112f74fdb | |
| parent | 1788b2e28939dfa9629db6533edeaa4b348d277a (diff) | |
| download | scintilla-mirror-5dfc62a244a8ca24efb9ce9cb51c1098e908a9a8.tar.gz | |
Backport: Arithmetic between enums is deprecated so use constexpr instead of enum or cast.
Added constexpr where reasonable.
Backport of changeset 8151:5f70c1eb371b.
| -rw-r--r-- | src/RESearch.h | 14 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 7 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/RESearch.h b/src/RESearch.h index 10ed4380d..49bfc0541 100644 --- a/src/RESearch.h +++ b/src/RESearch.h @@ -29,8 +29,8 @@ public: const char *Compile(const char *pattern, Sci::Position length, bool caseSensitive, bool posix) noexcept; int Execute(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp); - enum { MAXTAG=10 }; - enum { NOTFOUND=-1 }; + static constexpr int MAXTAG = 10; + static constexpr int NOTFOUND = -1; Sci::Position bopat[MAXTAG]; Sci::Position eopat[MAXTAG]; @@ -38,12 +38,12 @@ public: private: - enum { MAXNFA = 4096 }; - // The following enums are not meant to be changeable. + static constexpr int MAXNFA = 4096; + // The following constants are not meant to be changeable. // They are for readability only. - enum { MAXCHR = 256 }; - enum { CHRBIT = 8 }; - enum { BITBLK = MAXCHR / CHRBIT }; + static constexpr int MAXCHR = 256; + static constexpr int CHRBIT = 8; + static constexpr int BITBLK = MAXCHR / CHRBIT; void ChSet(unsigned char c) noexcept; void ChSetWithCase(unsigned char c, bool caseSensitive) noexcept; 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<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); @@ -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<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); } } |