#1047 Fix issue where enum registration discovered superfluous constants

SanderMertens · Oct 9, 2023 · 78305c4 · 78305c4
1 parent 070fe74
commit 78305c4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/flecs.h b/flecs.h
@@ -16355,7 +16355,11 @@ namespace _ {
 
 #if INTPTR_MAX == INT64_MAX
  #ifdef ECS_TARGET_MSVC
- #define ECS_SIZE_T_STR "unsigned __int64"
+ #if _MSC_VER >= 1930
+ #define ECS_SIZE_T_STR "unsigned __int64"
+ #else
+ #define ECS_SIZE_T_STR "unsigned int"
+ #endif 
  #elif defined(__clang__)
  #define ECS_SIZE_T_STR "size_t"
  #else
@@ -16367,7 +16371,11 @@ namespace _ {
  #endif
 #else
  #ifdef ECS_TARGET_MSVC
- #define ECS_SIZE_T_STR "unsigned __int32"
+ #if _MSC_VER >= 1930
+ #define ECS_SIZE_T_STR "unsigned __int32"
+ #else
+ #define ECS_SIZE_T_STR "unsigned int"
+ #endif 
  #elif defined(__clang__)
  #define ECS_SIZE_T_STR "size_t"
  #else

diff --git a/include/flecs/addons/cpp/utils/enum.hpp b/include/flecs/addons/cpp/utils/enum.hpp
@@ -66,7 +66,11 @@ namespace _ {
 
 #if INTPTR_MAX == INT64_MAX
  #ifdef ECS_TARGET_MSVC
- #define ECS_SIZE_T_STR "unsigned __int64"
+ #if _MSC_VER >= 1930
+ #define ECS_SIZE_T_STR "unsigned __int64"
+ #else
+ #define ECS_SIZE_T_STR "unsigned int"
+ #endif 
  #elif defined(__clang__)
  #define ECS_SIZE_T_STR "size_t"
  #else
@@ -78,7 +82,11 @@ namespace _ {
  #endif
 #else
  #ifdef ECS_TARGET_MSVC
- #define ECS_SIZE_T_STR "unsigned __int32"
+ #if _MSC_VER >= 1930
+ #define ECS_SIZE_T_STR "unsigned __int32"
+ #else
+ #define ECS_SIZE_T_STR "unsigned int"
+ #endif 
  #elif defined(__clang__)
  #define ECS_SIZE_T_STR "size_t"
  #else