From 1998261034ec7a948bb9b25b7cb88d014d371da1 Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Tue, 5 May 2015 22:41:03 -0400
Subject: [PATCH] Avoid using a C++ keyword as a structure member name.
Per request from Peter Eisentraut.
---
src/backend/access/transam/parallel.c | 11 ++++++-----
src/include/access/parallel.h | 2 +-
2 files changed, 7 insertions(+), 6 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. */
diff --git a/src/include/access/parallel.h b/src/include/access/parallel.h
index 8274f841b68..5f23f18f43b 100644
--- 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;
--
GitLab