diff options
| author | B Stack <bgstack15@gmail.com> | 2020-12-08 13:14:11 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-12-08 13:14:11 +0000 |
| commit | 35adf35f7d3b7744d58d7ff27fcaf1bb843060aa (patch) | |
| tree | 8e5414c3b8a914f57a1d4dc92ee0e55ae1f6e9ee /zen/globals.h | |
| parent | Merge branch '11.3' into 'master' (diff) | |
| parent | add upstream 11.4 (diff) | |
| download | FreeFileSync-35adf35f7d3b7744d58d7ff27fcaf1bb843060aa.tar.gz FreeFileSync-35adf35f7d3b7744d58d7ff27fcaf1bb843060aa.tar.bz2 FreeFileSync-35adf35f7d3b7744d58d7ff27fcaf1bb843060aa.zip | |
Merge branch '11.4' into 'master'11.4
add upstream 11.4
See merge request opensource-tracking/FreeFileSync!28
Diffstat (limited to 'zen/globals.h')
| -rw-r--r-- | zen/globals.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zen/globals.h b/zen/globals.h index 635909f7..47da2ac4 100644 --- a/zen/globals.h +++ b/zen/globals.h @@ -50,7 +50,7 @@ template <class T> class Global //don't use for function-scope statics! { public: - consteval2 Global() {}; //demand static zero-initialization! + consteval Global() {}; //demand static zero-initialization! ~Global() { @@ -108,7 +108,7 @@ template <class T> class FunStatGlobal { public: - consteval2 FunStatGlobal() {}; //demand static zero-initialization! + consteval FunStatGlobal() {}; //demand static zero-initialization! //No ~FunStatGlobal()! @@ -211,9 +211,9 @@ void registerGlobalForDestruction(CleanUpEntry& entry) } //------------------------------------------------------------------------------------------ -#ifdef __cpp_lib_atomic_wait - #error implement + rewiew improvements -#endif + #ifdef __cpp_lib_atomic_wait + #error implement + rewiew improvements + #endif inline |