Use a macro instead of defining no_unique_address which is forbidden …

…by the STL
legacyclonk · Sep 30, 2023 · 3dc77ac · 3dc77ac
1 parent 2b71857
commit 3dc77ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/C4Attributes.h b/src/C4Attributes.h
@@ -16,5 +16,7 @@
 #pragma once
 
 #if __has_cpp_attribute(msvc::no_unique_address)
-#define no_unique_address msvc::no_unique_address
+#define NO_UNIQUE_ADDRESS msvc::no_unique_address
+#else
+#define NO_UNIQUE_ADDRESS no_unique_address
 #endif
diff --git a/src/C4Coroutine.h b/src/C4Coroutine.h
@@ -56,7 +56,7 @@ class CancelledException : public std::exception
 template<typename U>
 struct ValueWrapper
 {
-	[[no_unique_address]] U Value;
+	[[NO_UNIQUE_ADDRESS]] U Value;
 	U &&GetValue() { return static_cast<U &&>(Value); }
 };
 

diff --git a/src/C4CurlSystem.h b/src/C4CurlSystem.h
@@ -200,7 +200,7 @@ class C4CurlSystem
 
 private:
 	std::atomic_uint32_t timeout{StdSync::Infinite};
-	[[no_unique_address]] GlobalInit globalInit;
+	[[NO_UNIQUE_ADDRESS]] GlobalInit globalInit;
 
 	MultiHandle multiHandle;