diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-05 10:30:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 10:30:16 +0100 |
| commit | 43a2955e234d2719a44a20653b9bc5439f045fed (patch) | |
| tree | 208f4a1cce329e1fef5a01111d1dbac5579a71f7 /modules/gdnative | |
| parent | 9cb78a67705cf7e4960d4eccf841f565de33bd82 (diff) | |
| parent | 9f3d7d970921ea89de7186dba649fc4ebb401b7a (diff) | |
Merge pull request #44926 from zerc/fix-string-humanize-size-test
Changed type to make it work on x32 architecture.
Diffstat (limited to 'modules/gdnative')
| -rw-r--r-- | modules/gdnative/gdnative/string.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/gdnative_api.json | 2 | ||||
| -rw-r--r-- | modules/gdnative/include/gdnative/string.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdnative/gdnative/string.cpp b/modules/gdnative/gdnative/string.cpp index f704d6c169..734bbe0d16 100644 --- a/modules/gdnative/gdnative/string.cpp +++ b/modules/gdnative/gdnative/string.cpp @@ -1112,7 +1112,7 @@ godot_string GDAPI godot_string_get_file(const godot_string *p_self) { return result; } -godot_string GDAPI godot_string_humanize_size(size_t p_size) { +godot_string GDAPI godot_string_humanize_size(uint64_t p_size) { godot_string result; String return_value = String::humanize_size(p_size); memnew_placement(&result, String(return_value)); diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json index e104c77eae..a29a0808ca 100644 --- a/modules/gdnative/gdnative_api.json +++ b/modules/gdnative/gdnative_api.json @@ -5029,7 +5029,7 @@ "name": "godot_string_humanize_size", "return_type": "godot_string", "arguments": [ - ["size_t", "p_size"] + ["uint64_t", "p_size"] ] }, { diff --git a/modules/gdnative/include/gdnative/string.h b/modules/gdnative/include/gdnative/string.h index 8f249792bb..e58be18b21 100644 --- a/modules/gdnative/include/gdnative/string.h +++ b/modules/gdnative/include/gdnative/string.h @@ -261,7 +261,7 @@ godot_bool godot_string_is_empty(const godot_string *p_self); // path functions godot_string GDAPI godot_string_get_base_dir(const godot_string *p_self); godot_string GDAPI godot_string_get_file(const godot_string *p_self); -godot_string GDAPI godot_string_humanize_size(size_t p_size); +godot_string GDAPI godot_string_humanize_size(uint64_t p_size); godot_bool GDAPI godot_string_is_abs_path(const godot_string *p_self); godot_bool GDAPI godot_string_is_rel_path(const godot_string *p_self); godot_bool GDAPI godot_string_is_resource_file(const godot_string *p_self); |