summaryrefslogtreecommitdiff
path: root/core/variant.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-07-20 12:00:13 +0200
committerGitHub <noreply@github.com>2019-07-20 12:00:13 +0200
commitd15cf7b672ac9911b4e82fed52b4c5e8d4312b0d (patch)
tree68ab08fafd7e14710ce245a47f3bb518ebf03307 /core/variant.cpp
parent700938bff772924941c4e1ea61bbfd2abe34d8d2 (diff)
parent6cbaf7662f5ee3ca1d02c0ebc85854fceee057af (diff)
Merge pull request #30576 from qarmin/lgtm_coverage
Changed some code reported by LGTM and Coverity
Diffstat (limited to 'core/variant.cpp')
-rw-r--r--core/variant.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/variant.cpp b/core/variant.cpp
index fe9623d068..1574af5239 100644
--- a/core/variant.cpp
+++ b/core/variant.cpp
@@ -1834,8 +1834,6 @@ inline DA _convert_array_from_variant(const Variant &p_variant) {
return DA();
}
}
-
- return DA();
}
Variant::operator Array() const {
@@ -2299,7 +2297,7 @@ Variant::Variant(const Object *p_object) {
Variant::Variant(const Dictionary &p_dictionary) {
type = DICTIONARY;
- memnew_placement(_data._mem, (Dictionary)(p_dictionary));
+ memnew_placement(_data._mem, Dictionary(p_dictionary));
}
Variant::Variant(const Array &p_array) {