Fix use of offsetof()

petere · petere · commit f1a469c9f1cf · 2016-09-30T14:00:44.000-04:00
Using offsetof() with a run-time computed argument is not allowed in
either C or C++.  Apparently, gcc allows it, but g++ doesn't.

Reviewed-by: Heikki Linnakangas &lt;hlinnaka@iki.fi&gt;
Reviewed-by: Thomas Munro &lt;thomas.munro@enterprisedb.com&gt;
diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c
@@ -75,7 +75,7 @@ _PG_init(void)
 		bl_relopt_tab[i + 1].optname = MemoryContextStrdup(TopMemoryContext,
 														   buf);
 		bl_relopt_tab[i + 1].opttype = RELOPT_TYPE_INT;
-		bl_relopt_tab[i + 1].offset = offsetof(BloomOptions, bitSize[i]);
+		bl_relopt_tab[i + 1].offset = offsetof(BloomOptions, bitSize[0]) + sizeof(int) * i;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ _PG_init(void)`
`75`	`75`	`bl_relopt_tab[i + 1].optname = MemoryContextStrdup(TopMemoryContext,`
`76`	`76`	`buf);`
`77`	`77`	`bl_relopt_tab[i + 1].opttype = RELOPT_TYPE_INT;`
`78`		`- bl_relopt_tab[i + 1].offset = offsetof(BloomOptions, bitSize[i]);`
	`78`	`+ bl_relopt_tab[i + 1].offset = offsetof(BloomOptions, bitSize[0]) + sizeof(int) * i;`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`