Merge pull request #44926 from zerc/fix-string-humanize-size-test

Changed type to make it work on x32 architecture.
This commit is contained in:
Rémi Verschelde 2021-01-05 10:30:16 +01:00 committed by GitHub
commit 43a2955e23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -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));

View File

@ -5029,7 +5029,7 @@
"name": "godot_string_humanize_size",
"return_type": "godot_string",
"arguments": [
["size_t", "p_size"]
["uint64_t", "p_size"]
]
},
{

View File

@ -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);