Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c32fe43

Browse files
committed
Avoid using a C++ keyword in header file
per cpluspluscheck
1 parent 586a46c commit c32fe43

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/backend/executor/execGrouping.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ BuildTupleHashTable(int numCols, AttrNumber *keyColIdx,
315315
hashtable->cur_eq_funcs = NULL;
316316

317317
hashtable->hashtab = tuplehash_create(tablecxt, nbuckets);
318-
hashtable->hashtab->private = hashtable;
318+
hashtable->hashtab->private_data = hashtable;
319319

320320
return hashtable;
321321
}
@@ -447,7 +447,7 @@ FindTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot,
447447
static uint32
448448
TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple)
449449
{
450-
TupleHashTable hashtable = (TupleHashTable) tb->private;
450+
TupleHashTable hashtable = (TupleHashTable) tb->private_data;
451451
int numCols = hashtable->numCols;
452452
AttrNumber *keyColIdx = hashtable->keyColIdx;
453453
uint32 hashkey = 0;
@@ -511,7 +511,7 @@ TupleHashTableMatch(struct tuplehash_hash *tb, const MinimalTuple tuple1, const
511511
{
512512
TupleTableSlot *slot1;
513513
TupleTableSlot *slot2;
514-
TupleHashTable hashtable = (TupleHashTable) tb->private;
514+
TupleHashTable hashtable = (TupleHashTable) tb->private_data;
515515

516516
/*
517517
* We assume that simplehash.h will only ever call us with the first

src/include/lib/simplehash.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ typedef struct SH_TYPE
116116
MemoryContext ctx;
117117

118118
/* user defined data, useful for callbacks */
119-
void *private;
119+
void *private_data;
120120
} SH_TYPE;
121121

122122
typedef enum SH_STATUS

0 commit comments

Comments
 (0)