Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
05b32fc0
Unverified
Commit
05b32fc0
authored
May 25, 2020
by
Timo Schwarzer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add static_assert checks where code assumes VARIANT_ARG_MAX == 5
parent
34d7e307
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
0 deletions
+6
-0
undo_redo.cpp
core/undo_redo.cpp
+2
-0
java_godot_lib_jni.cpp
platform/android/java_godot_lib_jni.cpp
+1
-0
scene_tree.cpp
scene/main/scene_tree.cpp
+3
-0
No files found.
core/undo_redo.cpp
View file @
05b32fc0
...
...
@@ -435,6 +435,7 @@ Variant UndoRedo::_add_do_method(const Variant **p_args, int p_argcount, Callabl
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
]);
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
];
}
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
]);
return
Variant
();
}
...
...
platform/android/java_godot_lib_jni.cpp
View file @
05b32fc0
...
...
@@ -435,6 +435,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv *
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
]);
// something
env
->
PopLocalFrame
(
nullptr
);
...
...
scene/main/scene_tree.cpp
View file @
05b32fc0
...
...
@@ -170,6 +170,7 @@ void SceneTree::_flush_ugc() {
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
]);
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
];
}
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
]);
return
Variant
();
}
...
...
@@ -926,6 +928,7 @@ Variant SceneTree::_call_group(const Variant **p_args, int p_argcount, Callable:
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
]);
return
Variant
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment