godotengine/godot-cpp
1
0
Fork 0
mirror of https://github.com/godotengine/godot-cpp.git synced 2026-01-06 06:10:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

CI: Various version bumps; sync with main repo

Browse Source
This commit is contained in:
Thaddeus Crews
2025-04-26 12:23:07 -05:00
parent 08fd033a9e
commit 64cdf089d9
13 changed files with 272 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/godot_cpp/variant/callable_method_pointer.hpp
View File

@@ -104,8 +104,7 @@ template <typename T, typename R, typename... P>
class CallableCustomMethodPointerRet : public CallableCustomMethodPointerBase {
struct Data {
T *instance;
R(T::*method)
(P...);
R (T::*method)(P...);
} data;
static_assert(sizeof(Data) % 4 == 0);
@@ -146,8 +145,7 @@ template <typename T, typename R, typename... P>
class CallableCustomMethodPointerRetC : public CallableCustomMethodPointerBase {
struct Data {
T *instance;
R(T::*method)
(P...) const;
R (T::*method)(P...) const;
} data;
static_assert(sizeof(Data) % 4 == 0);
@@ -227,8 +225,7 @@ Callable create_custom_callable_static_function_pointer(void (*p_method)(P...))
template <typename R, typename... P>
class CallableCustomStaticMethodPointerRet : public CallableCustomMethodPointerBase {
struct Data {
R(*method)
(P...);
R (*method)(P...);
} data;
static_assert(sizeof(Data) % 4 == 0);

2
include/godot_cpp/variant/char_string.hpp
View File

@@ -113,7 +113,7 @@ public:
CharStringT<T> &operator+=(T p_char);
int64_t length() const { return size() ? size() - 1 : 0; }
const T *get_data() const;
operator const T *() const { return get_data(); };
operator const T *() const { return get_data(); }
protected:
void copy_from(const T *p_cstr);

2
include/godot_cpp/variant/variant.hpp
View File

@@ -145,7 +145,7 @@ private:
static GDExtensionTypeFromVariantConstructorFunc to_type_constructor[VARIANT_MAX];
public:
_FORCE_INLINE_ GDExtensionVariantPtr _native_ptr() const { return const_cast<uint8_t(*)[GODOT_CPP_VARIANT_SIZE]>(&opaque); }
_FORCE_INLINE_ GDExtensionVariantPtr _native_ptr() const { return const_cast<uint8_t (*)[GODOT_CPP_VARIANT_SIZE]>(&opaque); }
Variant();
Variant(std::nullptr_t n) :
Variant() {}