diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-02-09 10:52:26 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-02-09 10:52:26 +1100 |
| commit | e79fadf10d92ade023c86d20891829c3dd02d5ee (patch) | |
| tree | f7ea622d25c902c13d22b061ad3cee91b2e36705 | |
| parent | a0e8dafb53e39b0726a0f44591a6540386d73cea (diff) | |
| download | scintilla-mirror-e79fadf10d92ade023c86d20891829c3dd02d5ee.tar.gz | |
Backport: Add noexcept to avoid warning.
Backport of changeset 7979:d4834f824a9a.
| -rw-r--r-- | win32/ScintillaWin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 257342cdd..5b42a85bc 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -357,7 +357,7 @@ class ScintillaWin : void ToggleHanja(); void AddWString(std::wstring wcs, CharacterSource charSource); - UINT CodePageOfDocument() const; + UINT CodePageOfDocument() const noexcept; bool ValidCodePage(int codePage) const override; sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; void IdleWork() override; @@ -1262,7 +1262,7 @@ UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage) noexcept { } -UINT ScintillaWin::CodePageOfDocument() const { +UINT ScintillaWin::CodePageOfDocument() const noexcept { return CodePageFromCharSet(vs.styles[STYLE_DEFAULT].characterSet, pdoc->dbcsCodePage); } |