summaryrefslogtreecommitdiff
path: root/zen
diff options
context:
space:
mode:
Diffstat (limited to 'zen')
-rw-r--r--zen/globals.h10
-rw-r--r--zen/legacy_compiler.h3
-rw-r--r--zen/sys_info.cpp2
-rw-r--r--zen/zstring.h3
4 files changed, 9 insertions, 9 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
diff --git a/zen/legacy_compiler.h b/zen/legacy_compiler.h
index 0cbb830e..66b750c9 100644
--- a/zen/legacy_compiler.h
+++ b/zen/legacy_compiler.h
@@ -29,9 +29,8 @@ namespace std
}
//---------------------------------------------------------------------------------
-//constinit, consteval
+//constinit
#define constinit2 constinit //GCC, clang have it
- #define consteval2 consteval //
namespace zen
diff --git a/zen/sys_info.cpp b/zen/sys_info.cpp
index 475e1c6c..70658a68 100644
--- a/zen/sys_info.cpp
+++ b/zen/sys_info.cpp
@@ -63,7 +63,7 @@ ComputerModel zen::getComputerModel() //throw FileError
cm.vendor = tryGetInfo("/sys/devices/virtual/dmi/id/sys_vendor"); //
//clean up:
- cm.model = beforeFirst(cm.model , L'\u00ff', IfNotFoundReturn::all); //fix broken BIOS entries:
+ cm.model = beforeFirst(cm.model, L'\u00ff', IfNotFoundReturn::all); //fix broken BIOS entries:
cm.vendor = beforeFirst(cm.vendor, L'\u00ff', IfNotFoundReturn::all); //0xff can be considered 0
for (const char* dummyModel :
diff --git a/zen/zstring.h b/zen/zstring.h
index 09aa43b9..234a398d 100644
--- a/zen/zstring.h
+++ b/zen/zstring.h
@@ -26,7 +26,7 @@ using Zstringc = zen::Zbase<char>;
/* Caveat: don't expect input/output string sizes to match:
- different UTF-8 encoding length of upper-case chars
- - different number of upper case chars (e.g. "ߢ => "SS" on macOS)
+ - different number of upper case chars (e.g. ß => "SS" on macOS)
- output is Unicode-normalized */
Zstring getUpperCase(const Zstring& str);
@@ -144,6 +144,7 @@ const wchar_t RTL_MARK = L'\u200F'; //UTF-8: E2 80 8F
const wchar_t* const ELLIPSIS = L"\u2026"; //"..."
const wchar_t MULT_SIGN = L'\u00D7'; //fancy "x"
//const wchar_t NOBREAK_SPACE = L'\u00A0';
+const wchar_t ZERO_WIDTH_SPACE = L'\u200B';
bgstack15