diff options
| author | David Snopek <dsnopek@gmail.com> | 2023-09-20 07:32:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-20 07:32:14 -0500 |
| commit | b1fd1b65fd2bfbeac9704c2716ed20bcb08d7107 (patch) | |
| tree | b5ba76e9cc29d9c4459b0dceca43a524fab921d4 /include/godot_cpp/core | |
| parent | 0d6de7a80e328c1969c9feabaf268008764c6812 (diff) | |
| parent | 1e5767693e45f58e2ffdc45d4c4f26057e25a2d6 (diff) | |
| download | redot-cpp-b1fd1b65fd2bfbeac9704c2716ed20bcb08d7107.tar.gz | |
Merge pull request #1242 from AThousandShips/null_check
Replace `ERR_FAIL_COND` with `ERR_FAIL_NULL` where applicable
Diffstat (limited to 'include/godot_cpp/core')
| -rw-r--r-- | include/godot_cpp/core/class_db.hpp | 2 | ||||
| -rw-r--r-- | include/godot_cpp/core/memory.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/godot_cpp/core/class_db.hpp b/include/godot_cpp/core/class_db.hpp index f23df06..930caa8 100644 --- a/include/godot_cpp/core/class_db.hpp +++ b/include/godot_cpp/core/class_db.hpp @@ -257,7 +257,7 @@ MethodBind *ClassDB::bind_static_method(StringName p_class, N p_method_name, M p template <class M> MethodBind *ClassDB::bind_vararg_method(uint32_t p_flags, StringName p_name, M p_method, const MethodInfo &p_info, const std::vector<Variant> &p_default_args, bool p_return_nil_is_variant) { MethodBind *bind = create_vararg_method_bind(p_method, p_info, p_return_nil_is_variant); - ERR_FAIL_COND_V(!bind, nullptr); + ERR_FAIL_NULL_V(bind, nullptr); bind->set_name(p_name); bind->set_default_arguments(p_default_args); diff --git a/include/godot_cpp/core/memory.hpp b/include/godot_cpp/core/memory.hpp index dd4a155..548f330 100644 --- a/include/godot_cpp/core/memory.hpp +++ b/include/godot_cpp/core/memory.hpp @@ -146,7 +146,7 @@ T *memnew_arr_template(size_t p_elements, const char *p_descr = "") { size_t len = sizeof(T) * p_elements; uint64_t *mem = (uint64_t *)Memory::alloc_static(len, true); T *failptr = nullptr; // Get rid of a warning. - ERR_FAIL_COND_V(!mem, failptr); + ERR_FAIL_NULL_V(mem, failptr); *(mem - 1) = p_elements; if (!std::is_trivially_destructible<T>::value) { |