Merge branch 'b11.21' into 'master'11.21

add upstream 11.21

See merge request opensource-tracking/FreeFileSync!44

1 files changed, 2 insertions, 2 deletions

diff --git a/zen/scope_guard.h b/zen/scope_guard.h
index 61422eb4..1e4165be 100644
--- a/zen/scope_guard.h
+++ b/zen/scope_guard.h
@@ -8,7 +8,7 @@
 #define SCOPE_GUARD_H_8971632487321434
 
 #include <cassert>
-#include <exception>
+//#include <exception>
 #include "type_traits.h"
 #include "legacy_compiler.h" //std::uncaught_exceptions
 
@@ -91,7 +91,7 @@ private:
     ScopeGuard           (const ScopeGuard&) = delete;
     ScopeGuard& operator=(const ScopeGuard&) = delete;
 
-    F fun_;
+    const F fun_;
     const int exeptionCount_ = std::uncaught_exceptions();
     bool dismissed_ = false;
 };