godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

Add static_assert checks where code assumes VARIANT_ARG_MAX == 5

Browse Source
This commit is contained in:
Timo Schwarzer
2020-05-25 21:55:03 +02:00
parent 34d7e30798
commit 05b32fc01d
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/undo_redo.cpp
View File

@@ -435,6 +435,7 @@ Variant UndoRedo::_add_do_method(const Variant **p_args, int p_argcount, Callabl
v[i] = *p_args[i + 2]; v[i] = *p_args[i + 2];
} }
static_assert(VARIANT_ARG_MAX == 5, "This code needs to be updated if VARIANT_ARG_MAX != 5");
add_do_method(object, method, v[0], v[1], v[2], v[3], v[4]); add_do_method(object, method, v[0], v[1], v[2], v[3], v[4]);
return Variant(); return Variant();
} }
@@ -471,6 +472,7 @@ Variant UndoRedo::_add_undo_method(const Variant **p_args, int p_argcount, Calla
v[i] = *p_args[i + 2]; v[i] = *p_args[i + 2];
} }
static_assert(VARIANT_ARG_MAX == 5, "This code needs to be updated if VARIANT_ARG_MAX != 5");
add_undo_method(object, method, v[0], v[1], v[2], v[3], v[4]); add_undo_method(object, method, v[0], v[1], v[2], v[3], v[4]);
return Variant(); return Variant();
} }

1
platform/android/java_godot_lib_jni.cpp
View File

@@ -435,6 +435,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv *
env->DeleteLocalRef(obj); env->DeleteLocalRef(obj);
}; };
static_assert(VARIANT_ARG_MAX == 5, "This code needs to be updated if VARIANT_ARG_MAX != 5");
obj->call_deferred(str_method, args[0], args[1], args[2], args[3], args[4]); obj->call_deferred(str_method, args[0], args[1], args[2], args[3], args[4]);
// something // something
env->PopLocalFrame(nullptr); env->PopLocalFrame(nullptr);

3
scene/main/scene_tree.cpp
View File

@@ -170,6 +170,7 @@ void SceneTree::_flush_ugc() {
v[i] = E->get()[i]; v[i] = E->get()[i];
} }
static_assert(VARIANT_ARG_MAX == 5, "This code needs to be updated if VARIANT_ARG_MAX != 5");
call_group_flags(GROUP_CALL_REALTIME, E->key().group, E->key().call, v[0], v[1], v[2], v[3], v[4]); call_group_flags(GROUP_CALL_REALTIME, E->key().group, E->key().call, v[0], v[1], v[2], v[3], v[4]);
unique_group_calls.erase(E); unique_group_calls.erase(E);
@@ -907,6 +908,7 @@ Variant SceneTree::_call_group_flags(const Variant **p_args, int p_argcount, Cal
v[i] = *p_args[i + 3]; v[i] = *p_args[i + 3];
} }
static_assert(VARIANT_ARG_MAX == 5, "This code needs to be updated if VARIANT_ARG_MAX != 5");
call_group_flags(flags, group, method, v[0], v[1], v[2], v[3], v[4]); call_group_flags(flags, group, method, v[0], v[1], v[2], v[3], v[4]);
return Variant(); return Variant();
} }
@@ -926,6 +928,7 @@ Variant SceneTree::_call_group(const Variant **p_args, int p_argcount, Callable:
v[i] = *p_args[i + 2]; v[i] = *p_args[i + 2];
} }
static_assert(VARIANT_ARG_MAX == 5, "This code needs to be updated if VARIANT_ARG_MAX != 5");
call_group_flags(0, group, method, v[0], v[1], v[2], v[3], v[4]); call_group_flags(0, group, method, v[0], v[1], v[2], v[3], v[4]);
return Variant(); return Variant();
} }