diff options
| author | George Marques <george@gmarqu.es> | 2021-08-19 14:47:56 -0300 |
|---|---|---|
| committer | Bastiaan Olij <mux213@gmail.com> | 2021-09-27 23:08:08 +1000 |
| commit | 8bcf32a61946620017f61568f4aa10070db4bd4e (patch) | |
| tree | a8b115439d994eee49ab03ceeccaa5c9912ca596 /include/godot_cpp/variant | |
| parent | e4ed48976a962b67e9585cc2d20d11f115ef7949 (diff) | |
| download | redot-cpp-8bcf32a61946620017f61568f4aa10070db4bd4e.tar.gz | |
Fix issues with method calls
Diffstat (limited to 'include/godot_cpp/variant')
| -rw-r--r-- | include/godot_cpp/variant/variant.hpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/godot_cpp/variant/variant.hpp b/include/godot_cpp/variant/variant.hpp index f94f907..32536c8 100644 --- a/include/godot_cpp/variant/variant.hpp +++ b/include/godot_cpp/variant/variant.hpp @@ -44,7 +44,8 @@ namespace godot { class Variant { uint8_t opaque[GODOT_CPP_VARIANT_SIZE]{ 0 }; - GDNativeVariantPtr ptr = const_cast<uint8_t (*)[GODOT_CPP_VARIANT_SIZE]>(&opaque); + + _FORCE_INLINE_ GDNativeVariantPtr ptr() const { return const_cast<uint8_t(*)[GODOT_CPP_VARIANT_SIZE]>(&opaque); } friend class GDExtensionBinding; friend class MethodBind; @@ -141,7 +142,7 @@ public: Variant(); Variant(std::nullptr_t n) : Variant() {} - Variant(const GDNativeVariantPtr native_ptr); + explicit Variant(const GDNativeVariantPtr native_ptr); Variant(const Variant &other); Variant(Variant &&other); Variant(bool v); @@ -235,17 +236,12 @@ public: operator PackedVector3Array() const; operator PackedColorArray() const; - operator const GDNativeVariantPtr() const; - operator GDNativeVariantPtr(); - Variant &operator=(const Variant &other); Variant &operator=(Variant &&other); bool operator==(const Variant &other) const; bool operator!=(const Variant &other) const; bool operator<(const Variant &other) const; - void operator=(const GDNativeVariantPtr other_ptr); - void call(const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDNativeCallError &r_error); template <class... Args> |