Merge pull request #487 from Ghabry/scopeguard

ScopeGuard: Allow move assignment
EasyRPG · Nov 28, 2024 · f166025 · f166025
2 parents 4d15bee + db2d122
commit f166025
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/lcf/scope_guard.h b/src/lcf/scope_guard.h
@@ -23,9 +23,13 @@ class ScopeGuard {
 		ScopeGuard(const ScopeGuard&) = delete;
 		ScopeGuard& operator=(const ScopeGuard&) = delete;
 
-		ScopeGuard(ScopeGuard&& o)
+		ScopeGuard(ScopeGuard&& o) noexcept
 			: _f(std::move(o._f)), _active(true) { o._active = false; }
-		ScopeGuard& operator=(ScopeGuard&&) = delete;
+		ScopeGuard& operator=(ScopeGuard&& o) noexcept {
+			_f = std::move(o._f);
+			o._active = false;
+			return *this;
+		};
 
 		~ScopeGuard() { Fire(); }