summaryrefslogtreecommitdiff
path: root/modules/gdnative
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-02-18 13:51:16 +0100
committerGitHub <noreply@github.com>2019-02-18 13:51:16 +0100
commit98e4bda9f922d63141b8c3c8be2b719ab517c1e6 (patch)
tree5b5f9e02a888fbb8fe17d8d99cdae3cb1c16284f /modules/gdnative
parent19f79d04fbf69ba7366fd9dd0269e97b181f1638 (diff)
parent66a43898d41ba912cad008cf9fff5d01411b18d6 (diff)
Merge pull request #26007 from marxin/fix-23015-cast
Make direct casting among Error and godot_error enums (#23015).
Diffstat (limited to 'modules/gdnative')
-rw-r--r--modules/gdnative/pluginscript/pluginscript_language.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/gdnative/pluginscript/pluginscript_language.cpp b/modules/gdnative/pluginscript/pluginscript_language.cpp
index ca1dd66a13..c9d92c09ed 100644
--- a/modules/gdnative/pluginscript/pluginscript_language.cpp
+++ b/modules/gdnative/pluginscript/pluginscript_language.cpp
@@ -173,8 +173,7 @@ Error PluginScriptLanguage::complete_code(const String &p_code, const String &p_
for (int i = 0; i < options.size(); i++) {
r_options->push_back(String(options[i]));
}
- Error err = *(Error *)&tmp;
- return err;
+ return (Error)tmp;
}
return ERR_UNAVAILABLE;
}