|
@@ -195,7 +195,7 @@ public:
|
|
template <typename T>
|
|
template <typename T>
|
|
static void register_class(bool p_virtual = false) {
|
|
static void register_class(bool p_virtual = false) {
|
|
GLOBAL_LOCK_FUNCTION;
|
|
GLOBAL_LOCK_FUNCTION;
|
|
- static_assert(types_are_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
|
|
|
|
|
|
+ static_assert(std::is_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
|
|
T::initialize_class();
|
|
T::initialize_class();
|
|
ClassInfo *t = classes.getptr(T::get_class_static());
|
|
ClassInfo *t = classes.getptr(T::get_class_static());
|
|
ERR_FAIL_NULL(t);
|
|
ERR_FAIL_NULL(t);
|
|
@@ -210,7 +210,7 @@ public:
|
|
template <typename T>
|
|
template <typename T>
|
|
static void register_abstract_class() {
|
|
static void register_abstract_class() {
|
|
GLOBAL_LOCK_FUNCTION;
|
|
GLOBAL_LOCK_FUNCTION;
|
|
- static_assert(types_are_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
|
|
|
|
|
|
+ static_assert(std::is_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
|
|
T::initialize_class();
|
|
T::initialize_class();
|
|
ClassInfo *t = classes.getptr(T::get_class_static());
|
|
ClassInfo *t = classes.getptr(T::get_class_static());
|
|
ERR_FAIL_NULL(t);
|
|
ERR_FAIL_NULL(t);
|
|
@@ -223,7 +223,7 @@ public:
|
|
template <typename T>
|
|
template <typename T>
|
|
static void register_internal_class() {
|
|
static void register_internal_class() {
|
|
GLOBAL_LOCK_FUNCTION;
|
|
GLOBAL_LOCK_FUNCTION;
|
|
- static_assert(types_are_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
|
|
|
|
|
|
+ static_assert(std::is_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
|
|
T::initialize_class();
|
|
T::initialize_class();
|
|
ClassInfo *t = classes.getptr(T::get_class_static());
|
|
ClassInfo *t = classes.getptr(T::get_class_static());
|
|
ERR_FAIL_NULL(t);
|
|
ERR_FAIL_NULL(t);
|
|
@@ -238,7 +238,7 @@ public:
|
|
template <typename T>
|
|
template <typename T>
|
|
static void register_runtime_class() {
|
|
static void register_runtime_class() {
|
|
GLOBAL_LOCK_FUNCTION;
|
|
GLOBAL_LOCK_FUNCTION;
|
|
- static_assert(types_are_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
|
|
|
|
|
|
+ static_assert(std::is_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
|
|
T::initialize_class();
|
|
T::initialize_class();
|
|
ClassInfo *t = classes.getptr(T::get_class_static());
|
|
ClassInfo *t = classes.getptr(T::get_class_static());
|
|
ERR_FAIL_NULL(t);
|
|
ERR_FAIL_NULL(t);
|
|
@@ -263,7 +263,7 @@ public:
|
|
template <typename T>
|
|
template <typename T>
|
|
static void register_custom_instance_class() {
|
|
static void register_custom_instance_class() {
|
|
GLOBAL_LOCK_FUNCTION;
|
|
GLOBAL_LOCK_FUNCTION;
|
|
- static_assert(types_are_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
|
|
|
|
|
|
+ static_assert(std::is_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
|
|
T::initialize_class();
|
|
T::initialize_class();
|
|
ClassInfo *t = classes.getptr(T::get_class_static());
|
|
ClassInfo *t = classes.getptr(T::get_class_static());
|
|
ERR_FAIL_NULL(t);
|
|
ERR_FAIL_NULL(t);
|