Commit1998261

committed

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

Per request from Peter Eisentraut.

1 parent929ca96 commit1998261Copy full SHA for 1998261

File tree

-6

lines changed

-6

lines changed

Lines changed: 6 additions & 5 deletions

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. */`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ typedef struct ParallelContext`
`41`	`41`	`ErrorContextCallback*error_context_stack;`
`42`	`42`	`shm_toc_estimatorestimator;`
`43`	`43`	`dsm_segment*seg;`
`44`		`-void*private;`
	`44`	`+void*private_memory;`
`45`	`45`	`shm_toc*toc;`
`46`	`46`	`ParallelWorkerInfo*worker;`
`47`	`47`	`}ParallelContext;`

Comments

(0)