From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 26 Oct 2016 16:00:00 +0000 (-0400)
Subject: Avoid using a C++ keyword in header file
X-Git-Tag: REL_10_BETA1~1495
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c32fe432afd4bc428acf4a237f911271746f689f;p=postgresql

Avoid using a C++ keyword in header file

per cpluspluscheck
---

diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index 5a4e736476..94cc59de7e 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -315,7 +315,7 @@ BuildTupleHashTable(int numCols, AttrNumber *keyColIdx,
 	hashtable->cur_eq_funcs = NULL;
 
 	hashtable->hashtab = tuplehash_create(tablecxt, nbuckets);
-	hashtable->hashtab->private = hashtable;
+	hashtable->hashtab->private_data = hashtable;
 
 	return hashtable;
 }
@@ -447,7 +447,7 @@ FindTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot,
 static uint32
 TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple)
 {
-	TupleHashTable hashtable = (TupleHashTable) tb->private;
+	TupleHashTable hashtable = (TupleHashTable) tb->private_data;
 	int			numCols = hashtable->numCols;
 	AttrNumber *keyColIdx = hashtable->keyColIdx;
 	uint32		hashkey = 0;
@@ -511,7 +511,7 @@ TupleHashTableMatch(struct tuplehash_hash *tb, const MinimalTuple tuple1, const
 {
 	TupleTableSlot *slot1;
 	TupleTableSlot *slot2;
-	TupleHashTable hashtable = (TupleHashTable) tb->private;
+	TupleHashTable hashtable = (TupleHashTable) tb->private_data;
 
 	/*
 	 * We assume that simplehash.h will only ever call us with the first
diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h
index 56d1f049a4..12aedbc384 100644
--- a/src/include/lib/simplehash.h
+++ b/src/include/lib/simplehash.h
@@ -116,7 +116,7 @@ typedef struct SH_TYPE
 	MemoryContext ctx;
 
 	/* user defined data, useful for callbacks */
-	void	   *private;
+	void	   *private_data;
 } SH_TYPE;
 
 typedef enum SH_STATUS