diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-16 11:00:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-16 11:00:44 +0100 |
| commit | 0a762a0e393295c200e61e323a74eda47948f509 (patch) | |
| tree | e192dafc1db3b00fbd8a18430e73eaae2abff080 | |
| parent | b07049faeab1add2950a84bee81b2e9b62898482 (diff) | |
| parent | 9d6d20e67c72614b6c8ff0296564230f4f75caa0 (diff) | |
Merge pull request #14726 from endragor/remove-get-stack-bottom
Remove get_stack_bottom
| -rw-r--r-- | core/os/os.cpp | 4 | ||||
| -rw-r--r-- | core/os/os.h | 7 | ||||
| -rw-r--r-- | modules/gdnative/gdnative/gdnative.cpp | 4 | ||||
| -rw-r--r-- | modules/gdnative/gdnative_api.json | 6 | ||||
| -rw-r--r-- | modules/gdnative/include/gdnative/gdnative.h | 4 |
5 files changed, 0 insertions, 25 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index 8088a6fa74..d81e70e612 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -606,10 +606,6 @@ bool OS::has_feature(const String &p_feature) { return false; } -void *OS::get_stack_bottom() const { - return _stack_bottom; -} - OS::OS() { void *volatile stack_bottom; diff --git a/core/os/os.h b/core/os/os.h index 41500acd93..d9f7b91daa 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -445,13 +445,6 @@ public: virtual void force_process_input(){}; bool has_feature(const String &p_feature); - /** - * Returns the stack bottom of the main thread of the application. - * This may be of use when integrating languages with garbage collectors that - * need to check whether a pointer is on the stack. - */ - virtual void *get_stack_bottom() const; - bool is_hidpi_allowed() const { return _allow_hidpi; } OS(); virtual ~OS(); diff --git a/modules/gdnative/gdnative/gdnative.cpp b/modules/gdnative/gdnative/gdnative.cpp index 92a88e354b..8ff67b10b1 100644 --- a/modules/gdnative/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative/gdnative.cpp @@ -52,10 +52,6 @@ godot_object GDAPI *godot_global_get_singleton(char *p_name) { return (godot_object *)Engine::get_singleton()->get_singleton_object(String(p_name)); } // result shouldn't be freed -void GDAPI *godot_get_stack_bottom() { - return OS::get_singleton()->get_stack_bottom(); -} - // MethodBind API godot_method_bind GDAPI *godot_method_bind_get_method(const char *p_classname, const char *p_methodname) { diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json index b7b2553435..06c6e9f410 100644 --- a/modules/gdnative/gdnative_api.json +++ b/modules/gdnative/gdnative_api.json @@ -5533,12 +5533,6 @@ ] }, { - "name": "godot_get_stack_bottom", - "return_type": "void *", - "arguments": [ - ] - }, - { "name": "godot_method_bind_get_method", "return_type": "godot_method_bind *", "arguments": [ diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index f7f5606428..9d7829a51f 100644 --- a/modules/gdnative/include/gdnative/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -212,10 +212,6 @@ void GDAPI godot_object_destroy(godot_object *p_o); godot_object GDAPI *godot_global_get_singleton(char *p_name); // result shouldn't be freed -////// OS API - -void GDAPI *godot_get_stack_bottom(); // returns stack bottom of the main thread - ////// MethodBind API typedef struct { |