From 1998261034ec7a948bb9b25b7cb88d014d371da1 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Tue, 5 May 2015 22:41:03 -0400 Subject: Avoid using a C++ keyword as a structure member name. Per request from Peter Eisentraut. --- src/backend/access/transam/parallel.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/backend/access/transam/parallel.c') diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c index 8ed7314b58c..8d6a3606794 100644 --- 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. */ -- cgit v1.2.3