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 5a4e7364766b838f9fc074c2c7f6b1762c81a2c8..94cc59de7e1cbcc21807e7553342eb1d80327087 100644 (file)
--- 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 56d1f049a44a458ec44d899b953b719246609e40..12aedbc384cdd3207ffcd6fae37efd073e9ac2f3 100644 (file)
--- 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