diff options
author | Neil <nyamatongwe@gmail.com> | 2018-05-01 09:52:18 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2018-05-01 09:52:18 +1000 |
commit | 2d0860ae4620af68d33a1691bf48cdb45d6b14c6 (patch) | |
tree | 3ec1bc66fdb86f0a63dfc7281f4344c437c8b681 /src/Editor.h | |
parent | e4d59c0da7564bc43533a4868a9d5d6304528581 (diff) | |
download | scintilla-mirror-2d0860ae4620af68d33a1691bf48cdb45d6b14c6.tar.gz |
Backport: Fix minor issues with AutoSurface, AutoLineLayout and SelectionText.
Backport of changeset 6769:b8ae2860861f.
Diffstat (limited to 'src/Editor.h')
-rw-r--r-- | src/Editor.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Editor.h b/src/Editor.h index 33dae2f67..260139b94 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -70,8 +70,6 @@ public: int codePage; int characterSet; SelectionText() : rectangular(false), lineCopy(false), codePage(0), characterSet(0) {} - ~SelectionText() { - } void Clear() { s.clear(); rectangular = false; @@ -633,13 +631,15 @@ public: } // Deleted so AutoSurface objects can not be copied. AutoSurface(const AutoSurface &) = delete; + AutoSurface(AutoSurface &&) = delete; void operator=(const AutoSurface &) = delete; + void operator=(AutoSurface &&) = delete; ~AutoSurface() { } - Surface *operator->() const { + Surface *operator->() const noexcept { return surf.get(); } - operator Surface *() const { + operator Surface *() const noexcept { return surf.get(); } }; |