From e79fadf10d92ade023c86d20891829c3dd02d5ee Mon Sep 17 00:00:00 2001 From: Neil Date: Sun, 9 Feb 2020 10:52:26 +1100 Subject: Backport: Add noexcept to avoid warning. Backport of changeset 7979:d4834f824a9a. --- win32/ScintillaWin.cxx | 4 ++-- 1 file 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); } -- cgit v1.2.3