From 9b2941ea45ed3de51c660008f75b8d15ce18cca5 Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 24 May 2018 09:24:44 +1000 Subject: Backport: Fix warnings. Add const, constexpr, and noexcept. Initialize. Standard methods. Replace 0 and NULL with nullptr for COM, DirectWrite and least ambiguous cases. Backport of changeset 6974:e99161ef7bdd. --- src/Editor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Editor.h') diff --git a/src/Editor.h b/src/Editor.h index bc295260e..e9a0bbf8f 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -412,7 +412,7 @@ protected: // ScintillaBase subclass needs access to much of Editor void DelCharBack(bool allowLineStartDeletion); virtual void ClaimSelection() = 0; - static int ModifierFlags(bool shift, bool ctrl, bool alt, bool meta=false, bool super=false); + static int ModifierFlags(bool shift, bool ctrl, bool alt, bool meta=false, bool super=false) noexcept; virtual void NotifyChange() = 0; virtual void NotifyFocus(bool focus); virtual void SetCtrlID(int identifier); -- cgit v1.2.3