From 5c9c8f89c962785bcaac84e9a9c22d7976a03784 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 19 Mar 2019 09:04:39 +1100 Subject: Backport: Make destructors public to avoid warnings. Backport of changeset 7323:09b4042d7092. --- src/Editor.h | 4 +++- src/ScintillaBase.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Editor.h b/src/Editor.h index cbdd171cf..e8d1ed48e 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -260,7 +260,7 @@ protected: // ScintillaBase subclass needs access to much of Editor Editor(Editor &&) = delete; Editor &operator=(const Editor &) = delete; Editor &operator=(Editor &&) = delete; - ~Editor() override; + // ~Editor() in public section virtual void Initialise() = 0; virtual void Finalise(); @@ -599,6 +599,8 @@ protected: // ScintillaBase subclass needs access to much of Editor static sptr_t BytesResult(sptr_t lParam, const unsigned char *val, size_t len) noexcept; public: + ~Editor() override; + // Public so the COM thunks can access it. bool IsUnicodeMode() const noexcept; // Public so scintilla_send_message can use it. diff --git a/src/ScintillaBase.h b/src/ScintillaBase.h index e886f22e2..39fb9d411 100644 --- a/src/ScintillaBase.h +++ b/src/ScintillaBase.h @@ -57,7 +57,7 @@ protected: ScintillaBase(ScintillaBase &&) = delete; ScintillaBase &operator=(const ScintillaBase &) = delete; ScintillaBase &operator=(ScintillaBase &&) = delete; - ~ScintillaBase() override; + // ~ScintillaBase() in public section void Initialise() override {} void Finalise() override; @@ -94,6 +94,8 @@ protected: void NotifyLexerChanged(Document *doc, void *userData) override; public: + ~ScintillaBase() override; + // Public so scintilla_send_message can use it sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override; }; -- cgit v1.2.3