Skip to content

Commit 8f36c97

Browse files
committed
Optimize varray.
1 parent 99a39ce commit 8f36c97

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

core/variant/variant.h

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -873,25 +873,9 @@ class Variant {
873873
}
874874
};
875875

876-
//typedef Dictionary Dictionary; no
877-
//typedef Array Array;
878-
879876
template <typename... VarArgs>
880877
Vector<Variant> varray(VarArgs... p_args) {
881-
Vector<Variant> v;
882-
883-
Variant args[sizeof...(p_args) + 1] = { p_args..., Variant() }; // +1 makes sure zero sized arrays are also supported.
884-
uint32_t argc = sizeof...(p_args);
885-
886-
if (argc > 0) {
887-
v.resize(argc);
888-
Variant *vw = v.ptrw();
889-
890-
for (uint32_t i = 0; i < argc; i++) {
891-
vw[i] = args[i];
892-
}
893-
}
894-
return v;
878+
return Vector<Variant>{ p_args... };
895879
}
896880

897881
struct VariantHasher {

0 commit comments

Comments
 (0)