diff options
| author | Campbell Barton <campbell@blender.org> | 2022-07-22 05:23:33 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-07-22 05:23:33 +0300 |
| commit | d3db38cfb1f223b81ab89c38bae0652a0d40c03e (patch) | |
| tree | b088933529a5246f0c1be8351a5e48ad9111bb95 /source/blender/blenkernel | |
| parent | 77257405437336dbd91a481926013f8c747cacae (diff) | |
Cleanup: quiet nonull-compare warnings with GCC
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/main_namemap.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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; |