From 37d9916020286caec810f4de61fbd0de3568454d Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 29 Jan 2019 01:16:24 +0100 Subject: More unconstify use Replace casts whose only purpose is to cast away const with the unconstify() macro. Discussion: https://www.postgresql.org/message-id/flat/53a28052-f9f3-1808-fed9-460fd43035ab%402ndquadrant.com --- contrib/btree_gist/btree_utils_num.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'contrib/btree_gist') diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c index 4d10bc93f3e..7564a403c7d 100644 --- a/contrib/btree_gist/btree_utils_num.c +++ b/contrib/btree_gist/btree_utils_num.c @@ -185,10 +185,10 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin c.upper = &cur[tinfo->size]; /* if out->lower > cur->lower, adopt cur as lower */ if (tinfo->f_gt(o.lower, c.lower, flinfo)) - memcpy((void *) o.lower, c.lower, tinfo->size); + memcpy(unconstify(GBT_NUMKEY *, o.lower), c.lower, tinfo->size); /* if out->upper < cur->upper, adopt cur as upper */ if (tinfo->f_lt(o.upper, c.upper, flinfo)) - memcpy((void *) o.upper, c.upper, tinfo->size); + memcpy(unconstify(GBT_NUMKEY *, o.upper), c.upper, tinfo->size); } return out; @@ -237,9 +237,9 @@ gbt_num_bin_union(Datum *u, GBT_NUMKEY *e, const gbtree_ninfo *tinfo, FmgrInfo * ur.lower = &(((GBT_NUMKEY *) DatumGetPointer(*u))[0]); ur.upper = &(((GBT_NUMKEY *) DatumGetPointer(*u))[tinfo->size]); if (tinfo->f_gt(ur.lower, rd.lower, flinfo)) - memcpy((void *) ur.lower, rd.lower, tinfo->size); + memcpy(unconstify(GBT_NUMKEY *, ur.lower), rd.lower, tinfo->size); if (tinfo->f_lt(ur.upper, rd.upper, flinfo)) - memcpy((void *) ur.upper, rd.upper, tinfo->size); + memcpy(unconstify(GBT_NUMKEY *, ur.upper), rd.upper, tinfo->size); } } -- cgit v1.2.3