diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2016-03-16 21:34:59 +0100 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2016-03-16 21:34:59 +0100 |
| commit | 339ed7f63798fb5ccab05fa7fb9d0d95743c9c89 (patch) | |
| tree | 214819f601b69bfd32507ca59047dd4d68ed5632 /zen/scope_guard.h | |
| parent | 7.9 (diff) | |
| download | FreeFileSync-339ed7f63798fb5ccab05fa7fb9d0d95743c9c89.tar.gz FreeFileSync-339ed7f63798fb5ccab05fa7fb9d0d95743c9c89.tar.bz2 FreeFileSync-339ed7f63798fb5ccab05fa7fb9d0d95743c9c89.zip | |
8.0
Diffstat (limited to 'zen/scope_guard.h')
| -rw-r--r-- | zen/scope_guard.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zen/scope_guard.h b/zen/scope_guard.h index 1345447e..67eb3053 100644 --- a/zen/scope_guard.h +++ b/zen/scope_guard.h @@ -20,7 +20,7 @@ inline int getUncaughtExceptionCount() { return std::uncaught_exceptions(); } #elif defined ZEN_LINUX || defined ZEN_MAC //std::uncaught_exceptions() currently unsupported on GCC and Clang => clean up ASAP #ifdef ZEN_LINUX - static_assert(__GNUC__ < 5 || (__GNUC__ == 5 && (__GNUC_MINOR__ < 2 || (__GNUC_MINOR__ == 2 && __GNUC_PATCHLEVEL__ <= 1))), "check std::uncaught_exceptions support"); + static_assert(__GNUC__ < 5 || (__GNUC__ == 5 && (__GNUC_MINOR__ < 3 || (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ <= 1))), "check std::uncaught_exceptions support"); #else static_assert(__clang_major__ < 7 || (__clang_major__ == 7 && __clang_minor__ <= 0), "check std::uncaught_exceptions support"); #endif @@ -76,7 +76,7 @@ public: if (!dismissed) { #ifdef _MSC_VER - #pragma warning(suppress: 4127) //"conditional expression is constant" +#pragma warning(suppress: 4127) //"conditional expression is constant" #endif if (runMode != ScopeGuardRunMode::ON_EXIT) { @@ -86,7 +86,7 @@ public: } #ifdef _MSC_VER - #pragma warning(suppress: 4127) //"conditional expression is constant" +#pragma warning(suppress: 4127) //"conditional expression is constant" #endif if (runMode == ScopeGuardRunMode::ON_SUCCESS) fun_(); //throw X |