From 2d0860ae4620af68d33a1691bf48cdb45d6b14c6 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 1 May 2018 09:52:18 +1000 Subject: Backport: Fix minor issues with AutoSurface, AutoLineLayout and SelectionText. Backport of changeset 6769:b8ae2860861f. --- src/EditView.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/EditView.h') diff --git a/src/EditView.h b/src/EditView.h index ac42f072b..f649f7c87 100644 --- a/src/EditView.h +++ b/src/EditView.h @@ -160,19 +160,19 @@ class AutoLineLayout { LineLayoutCache &llc; LineLayout *ll; public: - AutoLineLayout(LineLayoutCache &llc_, LineLayout *ll_) : llc(llc_), ll(ll_) {} + AutoLineLayout(LineLayoutCache &llc_, LineLayout *ll_) noexcept : llc(llc_), ll(ll_) {} AutoLineLayout(const AutoLineLayout &) = delete; AutoLineLayout(AutoLineLayout &&) = delete; AutoLineLayout &operator=(const AutoLineLayout &) = delete; AutoLineLayout &operator=(AutoLineLayout &&) = delete; ~AutoLineLayout() { llc.Dispose(ll); - ll = 0; + ll = nullptr; } - LineLayout *operator->() const { + LineLayout *operator->() const noexcept { return ll; } - operator LineLayout *() const { + operator LineLayout *() const noexcept { return ll; } void Set(LineLayout *ll_) { -- cgit v1.2.3