diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-07-27 15:04:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-27 15:04:20 +0200 |
commit | b4778082d1d8afe74eb5900e114b015faab4a526 (patch) | |
tree | c2c8d9ace9daf6881dd7c3992b824cea3acce017 /core | |
parent | 0f38fa2e0c35ea956fb9ddeeb19d014503b974fa (diff) | |
parent | 84c37423fba88655d5b40474c4fcafca39da46bb (diff) |
Merge pull request #50939 from vnen/fix-variant-bool-conversion
Change Variant bool conversion to uint8_t
Diffstat (limited to 'core')
-rw-r--r-- | core/extension/gdnative_interface.h | 2 | ||||
-rw-r--r-- | 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 c1ebb3e76a..3e69a28d59 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 7852187b77..8836e257a9 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); |