[Bf-blender-cvs] [270faa4e9cf] master: Cleanup: Fix warning in makesdna
Ray Molenkamp
noreply at git.blender.org
Mon May 27 16:44:42 CEST 2019
Commit: 270faa4e9cf79e7355ea12a1a8fa316f7f4e78d7
Author: Ray Molenkamp
Date: Mon May 27 08:44:37 2019 -0600
Branches: master
https://developer.blender.org/rB270faa4e9cf79e7355ea12a1a8fa316f7f4e78d7
Cleanup: Fix warning in makesdna
passing a const pointer to BLI_ghash_insert causes warning
C4090 'function': different 'const' qualifiers
with MSVC
===================================================================
M source/blender/makesdna/intern/dna_utils.c
===================================================================
diff --git a/source/blender/makesdna/intern/dna_utils.c b/source/blender/makesdna/intern/dna_utils.c
index 425deaf121f..c402b36812b 100644
--- a/source/blender/makesdna/intern/dna_utils.c
+++ b/source/blender/makesdna/intern/dna_utils.c
@@ -265,7 +265,7 @@ void DNA_alias_maps(enum eDNA_RenameDir version_dir, GHash **r_struct_map, GHash
const char **str_pair = MEM_mallocN(sizeof(char *) * 2, __func__);
str_pair[0] = BLI_ghash_lookup_default(struct_map_local, data[i][0], (void *)data[i][0]);
str_pair[1] = data[i][elem_key];
- BLI_ghash_insert(elem_map, str_pair, (void *)data[i][elem_val]);
+ BLI_ghash_insert(elem_map, (void *)str_pair, (void *)data[i][elem_val]);
}
*r_elem_map = elem_map;
}
More information about the Bf-blender-cvs
mailing list