cihounimadecudaaa

zenustech · Sep 7, 2023 · fbefb22 · fbefb22
1 parent 7b6b49c
commit fbefb22
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/projects/Alembic/Alembic b/projects/Alembic/Alembic
diff --git a/zeno/include/zeno/utils/compile_opts.h b/zeno/include/zeno/utils/compile_opts.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#if defined(__GNUC__) || defined(__clang__)
+#if defined(__GNUC__) || (defined(__clang__) && !defined(_MSC_VER))
 
 #define ZENO_LIKELY(x) (__builtin_expect(!!(x), 1))
 #define ZENO_UNLIKELY(x) (__builtin_expect(!!(x), 0))
 #define ZENO_RESTRICT __restrict__
 #define ZENO_FORCEINLINE __inline__ __attribute__((always_inline))
 #define ZENO_ASSUME_ALIGNED(x, n) ((void *)__builtin_assume_aligned((void *)(x), (n)))
-#define ZENO_GNUC_ATTRIBUTE(...) __attribute____((__VA_ARGS__))
+#define ZENO_GNUC_ATTRIBUTE(...) __attribute__((__VA_ARGS__))
 #define ZENO_MSVC_DECLSPEC(...)
 #define ZENO_ENABLE_IF_GNUC(...) __VA_ARGS__
 #define ZENO_ENABLE_IF_MSVC(...)
@@ -30,7 +30,7 @@
 #define ZENO_UNLIKELY(x) (x)
 #define ZENO_RESTRICT
 #define ZENO_FORCEINLINE
-#define ZENO_ASSUME_ALIGNED(x, n) (x)
+#define ZENO_ASSUME_ALIGNED(x, n) ((void *)((uintptr_t)(x) & (n - 1)))
 #define ZENO_GNUC_ATTRIBUTE(...)
 #define ZENO_MSVC_DECLSPEC(...)
 #define ZENO_ENABLE_IF_GNUC(...)
@@ -51,6 +51,7 @@
     _Pragma("GCC diagnostic ignored \"-Wsuggest-override\"") \
     _Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"") \
     _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") \
+    _Pragma("GCC diagnostic ignored \"-Wuninitialized\"") \
     _Pragma("GCC diagnostic ignored \"-Wmissing-declarations\"") \
     _Pragma("GCC diagnostic ignored \"-Wformat-security\"") \
     _Pragma("GCC diagnostic ignored \"-Wformat=\"")
@@ -61,9 +62,10 @@
     _Pragma("GCC diagnostic push") \
     _Pragma("GCC diagnostic ignored \"-Wall\"") \
     _Pragma("GCC diagnostic ignored \"-Wextra\"") \
-    _Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"")
-    _Pragma("GCC diagnostic ignored \"-Wsuggest-override\"")
-    _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+    _Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"") \
+    _Pragma("GCC diagnostic ignored \"-Wsuggest-override\"") \
+    _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") \
+    _Pragma("GCC diagnostic ignored \"-Wuninitialized\"") \
     _Pragma("GCC diagnostic ignored \"-Wmissing-declarations\"") \
     _Pragma("GCC diagnostic ignored \"-Wformat-security\"") \
     _Pragma("GCC diagnostic ignored \"-Wformat=\"")