Skip to content

Core: Implement NotNull<T> #105962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+564 −7
Draft

Core: Implement NotNull<T> #105962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/extension/extension_api_dump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static String get_property_info_type_name(const PropertyInfo &p_info) {
}

static String get_type_meta_name(const GodotTypeInfo::Metadata metadata) {
static const char *argmeta[13] = { "none", "int8", "int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64", "float", "double", "char16", "char32" };
static const char *argmeta[14] = { "none", "int8", "int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64", "float", "double", "char16", "char32", "not_null" };
return argmeta[metadata];
}

Expand Down
2 changes: 1 addition & 1 deletion core/extension/gdextension_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ static void gdextension_object_free_instance_binding(GDExtensionObjectPtr p_obje

static void gdextension_object_set_instance(GDExtensionObjectPtr p_object, GDExtensionConstStringNamePtr p_classname, GDExtensionClassInstancePtr p_instance) {
const StringName classname = *reinterpret_cast<const StringName *>(p_classname);
Object *o = (Object *)p_object;
NeverNull<Object *> o = NeverNull<Object *>((Object *)p_object);
ClassDB::set_object_extension_instance(o, classname, p_instance);
}

Expand Down
3 changes: 1 addition & 2 deletions core/object/class_db.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,8 +730,7 @@ ObjectGDExtension *ClassDB::get_placeholder_extension(const StringName &p_class)
}
#endif

void ClassDB::set_object_extension_instance(Object *p_object, const StringName &p_class, GDExtensionClassInstancePtr p_instance) {
ERR_FAIL_NULL(p_object);
void ClassDB::set_object_extension_instance(NeverNull<Object *> p_object, const StringName &p_class, GDExtensionClassInstancePtr p_instance) {
ClassInfo *ti;
{
Locker::Lock lock(Locker::STATE_READ);
Expand Down
2 changes: 1 addition & 1 deletion core/object/class_db.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ class ClassDB {
static Object *instantiate(const StringName &p_class);
static Object *instantiate_no_placeholders(const StringName &p_class);
static Object *instantiate_without_postinitialization(const StringName &p_class);
static void set_object_extension_instance(Object *p_object, const StringName &p_class, GDExtensionClassInstancePtr p_instance);
static void set_object_extension_instance(NeverNull<Object *> p_object, const StringName &p_class, GDExtensionClassInstancePtr p_instance);

static APIType get_api_type(const StringName &p_class);

Expand Down
Loading
Loading