From dae91af92db2b316cec2db17328e92306b915753 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Tue, 8 Dec 2020 08:13:55 -0500
Subject: add upstream 11.4

---
 zen/globals.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'zen/globals.h')

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
-- 
cgit