[Bf-blender-cvs] [d3db38cfb1f] master: Cleanup: quiet nonull-compare warnings with GCC
Campbell Barton
noreply at git.blender.org
Fri Jul 22 04:27:35 CEST 2022
Commit: d3db38cfb1f223b81ab89c38bae0652a0d40c03e
Author: Campbell Barton
Date: Fri Jul 22 12:23:33 2022 +1000
Branches: master
https://developer.blender.org/rBd3db38cfb1f223b81ab89c38bae0652a0d40c03e
Cleanup: quiet nonull-compare warnings with GCC
===================================================================
M source/blender/blenkernel/intern/main_namemap.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/main_namemap.cc b/source/blender/blenkernel/intern/main_namemap.cc
index 3cbd33057a8..00115d2a0be 100644
--- a/source/blender/blenkernel/intern/main_namemap.cc
+++ b/source/blender/blenkernel/intern/main_namemap.cc
@@ -242,8 +242,10 @@ static UniqueName_Map *get_namemap_for(Main *bmain, ID *id, bool ensure_created)
bool BKE_main_namemap_get_name(struct Main *bmain, struct ID *id, char *name)
{
+#ifndef __GNUC__ /* GCC warns with `nonull-compare`. */
BLI_assert(bmain != nullptr);
BLI_assert(id != nullptr);
+#endif
UniqueName_Map *name_map = get_namemap_for(bmain, id, true);
BLI_assert(name_map != nullptr);
BLI_assert(strlen(name) < MAX_NAME);
@@ -325,9 +327,11 @@ bool BKE_main_namemap_get_name(struct Main *bmain, struct ID *id, char *name)
void BKE_main_namemap_remove_name(struct Main *bmain, struct ID *id, const char *name)
{
+#ifndef __GNUC__ /* GCC warns with `nonull-compare`. */
BLI_assert(bmain != nullptr);
BLI_assert(id != nullptr);
BLI_assert(name != nullptr);
+#endif
/* Name is empty or not initialized yet, nothing to remove. */
if (name[0] == '\0') {
return;
More information about the Bf-blender-cvs
mailing list