diff options
| author | Robert Haas <rhaas@postgresql.org> | 2015-05-05 22:41:03 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2015-05-05 22:41:03 -0400 |
| commit | 1998261034ec7a948bb9b25b7cb88d014d371da1 (patch) | |
| tree | ee81f62d42154f385acd897d095322c49957d9da /src/backend/access/transam/parallel.c | |
| parent | 929ca96584bef1cc7d09a8e57d26d8c3f25a92a4 (diff) | |
| download | postgresql-1998261034ec7a948bb9b25b7cb88d014d371da1.tar.gz postgresql-1998261034ec7a948bb9b25b7cb88d014d371da1.zip | |
Avoid using a C++ keyword as a structure member name.
Per request from Peter Eisentraut.
Diffstat (limited to 'src/backend/access/transam/parallel.c')
| -rw-r--r-- | src/backend/access/transam/parallel.c | 11 |
1 files changed, 6 insertions, 5 deletions
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. */ |