From fa93bd28150e92b485ef6f094fda8a1ba5a5ed65 Mon Sep 17 00:00:00 2001 From: Neil Date: Sun, 28 Apr 2019 09:35:43 +1000 Subject: Backport: Declare KeyMap::Clear() noexcept as called in destructor. Backport of changeset 7481:392990fdc714. --- src/KeyMap.cxx | 2 +- src/KeyMap.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/KeyMap.cxx b/src/KeyMap.cxx index 42982b4f7..7171e3318 100644 --- a/src/KeyMap.cxx +++ b/src/KeyMap.cxx @@ -32,7 +32,7 @@ KeyMap::~KeyMap() { Clear(); } -void KeyMap::Clear() { +void KeyMap::Clear() noexcept { kmap.clear(); } diff --git a/src/KeyMap.h b/src/KeyMap.h index 6f30abf00..539b5e99a 100644 --- a/src/KeyMap.h +++ b/src/KeyMap.h @@ -53,7 +53,7 @@ class KeyMap { public: KeyMap(); ~KeyMap(); - void Clear(); + void Clear() noexcept; void AssignCmdKey(int key, int modifiers, unsigned int msg); unsigned int Find(int key, int modifiers) const; // 0 returned on failure const std::map &GetKeyMap() const; -- cgit v1.2.3