Avoid using a C++ keyword as a structure member name.

robertmhaas · robertmhaas · commit 1998261034ec · 2015-05-05T22:41:03.000-04:00
Per request from Peter Eisentraut.
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
@@ -266,8 +266,9 @@ InitializeParallelDSM(ParallelContext *pcxt)
 	else
 	{
 		pcxt->nworkers = 0;
-		pcxt->private = MemoryContextAlloc(TopMemoryContext, segsize);
-		pcxt->toc = shm_toc_create(PARALLEL_MAGIC, pcxt->private, segsize);
+		pcxt->private_memory = MemoryContextAlloc(TopMemoryContext, segsize);
+		pcxt->toc = shm_toc_create(PARALLEL_MAGIC, pcxt->private_memory,
+								   segsize);
 	}
 
 	/* Initialize fixed-size state in shared memory. */
@@ -538,10 +539,10 @@ DestroyParallelContext(ParallelContext *pcxt)
 	 * If this parallel context is actually in backend-private memory rather
 	 * than shared memory, free that memory instead.
 	 */
-	if (pcxt->private != NULL)
+	if (pcxt->private_memory != NULL)
 	{
-		pfree(pcxt->private);
-		pcxt->private = NULL;
+		pfree(pcxt->private_memory);
+		pcxt->private_memory = NULL;
 	}
 
 	/* Wait until the workers actually die. */
diff --git a/src/include/access/parallel.h b/src/include/access/parallel.h
@@ -41,7 +41,7 @@ typedef struct ParallelContext
 	ErrorContextCallback *error_context_stack;
 	shm_toc_estimator estimator;
 	dsm_segment *seg;
-	void *private;
+	void *private_memory;
 	shm_toc *toc;
 	ParallelWorkerInfo *worker;
 } ParallelContext;

Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,9 @@ InitializeParallelDSM(ParallelContext *pcxt)`
`266`	`266`	`else`
`267`	`267`	`{`
`268`	`268`	`pcxt->nworkers = 0;`
`269`		`- pcxt->private = MemoryContextAlloc(TopMemoryContext, segsize);`
`270`		`- pcxt->toc = shm_toc_create(PARALLEL_MAGIC, pcxt->private, segsize);`
	`269`	`+ pcxt->private_memory = MemoryContextAlloc(TopMemoryContext, segsize);`
	`270`	`+ pcxt->toc = shm_toc_create(PARALLEL_MAGIC, pcxt->private_memory,`
	`271`	`+ segsize);`
`271`	`272`	`}`
`272`	`273`
`273`	`274`	`/* Initialize fixed-size state in shared memory. */`
`@@ -538,10 +539,10 @@ DestroyParallelContext(ParallelContext *pcxt)`
`538`	`539`	`* If this parallel context is actually in backend-private memory rather`
`539`	`540`	`* than shared memory, free that memory instead.`
`540`	`541`	`*/`
`541`		`- if (pcxt->private != NULL)`
	`542`	`+ if (pcxt->private_memory != NULL)`
`542`	`543`	`{`
`543`		`- pfree(pcxt->private);`
`544`		`- pcxt->private = NULL;`
	`544`	`+ pfree(pcxt->private_memory);`
	`545`	`+ pcxt->private_memory = NULL;`
`545`	`546`	`}`
`546`	`547`
`547`	`548`	`/* Wait until the workers actually die. */`