database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-23 14:01:44 +03:00
Code Activity

Avoid using a C++ keyword in header file

Browse Source 
per cpluspluscheck
This commit is contained in:
Peter Eisentraut
2016-10-26 12:00:00 -04:00
parent 586a46c22c
commit c32fe432af
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/executor/execGrouping.c
View File

@ -315,7 +315,7 @@ BuildTupleHashTable(int numCols, AttrNumber *keyColIdx,
hashtable->cur_eq_funcs = NULL; hashtable->cur_eq_funcs = NULL;
hashtable->hashtab = tuplehash_create(tablecxt, nbuckets); hashtable->hashtab = tuplehash_create(tablecxt, nbuckets);
hashtable->hashtab->private = hashtable; hashtable->hashtab->private_data = hashtable;
return hashtable; return hashtable;
} }
@ -447,7 +447,7 @@ FindTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot,
static uint32 static uint32
TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple) TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple)
{ {
TupleHashTable hashtable = (TupleHashTable) tb->private; TupleHashTable hashtable = (TupleHashTable) tb->private_data;
int numCols = hashtable->numCols; int numCols = hashtable->numCols;
AttrNumber *keyColIdx = hashtable->keyColIdx; AttrNumber *keyColIdx = hashtable->keyColIdx;
uint32 hashkey = 0; uint32 hashkey = 0;
@ -511,7 +511,7 @@ TupleHashTableMatch(struct tuplehash_hash *tb, const MinimalTuple tuple1, const
{ {
TupleTableSlot *slot1; TupleTableSlot *slot1;
TupleTableSlot *slot2; 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 * We assume that simplehash.h will only ever call us with the first

2
src/include/lib/simplehash.h
View File

@ -116,7 +116,7 @@ typedef struct SH_TYPE
MemoryContext ctx; MemoryContext ctx;
/* user defined data, useful for callbacks */ /* user defined data, useful for callbacks */
void *private; void *private_data;
} SH_TYPE; } SH_TYPE;
typedef enum SH_STATUS typedef enum SH_STATUS