From 84c37423fba88655d5b40474c4fcafca39da46bb Mon Sep 17 00:00:00 2001 From: George Marques Date: Tue, 27 Jul 2021 09:00:56 -0300 Subject: [PATCH] Change Variant bool conversion to uint8_t This ensures more portable conversion since not every path assume bool is 32-bits and there's no loss converting to 8-bits anyway. --- core/extension/gdnative_interface.h | 2 +- core/variant/method_ptrcall.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/extension/gdnative_interface.h b/core/extension/gdnative_interface.h index c1ebb3e76af..3e69a28d595 100644 --- a/core/extension/gdnative_interface.h +++ b/core/extension/gdnative_interface.h @@ -134,7 +134,7 @@ typedef void *GDNativeObjectPtr; typedef void *GDNativeTypePtr; typedef void *GDNativeMethodBindPtr; typedef int64_t GDNativeInt; -typedef uint32_t GDNativeBool; +typedef uint8_t GDNativeBool; typedef uint64_t GDObjectInstanceID; /* VARIANT DATA I/O */ diff --git a/core/variant/method_ptrcall.h b/core/variant/method_ptrcall.h index 7852187b77d..8836e257a92 100644 --- a/core/variant/method_ptrcall.h +++ b/core/variant/method_ptrcall.h @@ -105,7 +105,7 @@ struct PtrToArg {}; } \ } -MAKE_PTRARGCONV(bool, uint32_t); +MAKE_PTRARGCONV(bool, uint8_t); // Integer types. MAKE_PTRARGCONV(uint8_t, int64_t); MAKE_PTRARGCONV(int8_t, int64_t);