diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-04-21 11:21:15 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-04-21 11:21:15 -0400 |
| commit | 9d25e1aa311c0f0c77155382e6608545b7bf579c (patch) | |
| tree | 50cc381e9e3a6e206fe75ca41068fb84b508df40 /src | |
| parent | 2117c3cb3d51e73290f464ad725fe829c96b9213 (diff) | |
| download | postgresql-9d25e1aa311c0f0c77155382e6608545b7bf579c.tar.gz postgresql-9d25e1aa311c0f0c77155382e6608545b7bf579c.zip | |
Clean up cpluspluscheck violation.
"operator" is a reserved word in C++, so per project conventions,
don't use it as an identifier in header files.
My oversight in commit a80818605.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/selfuncs.c | 4 | ||||
| -rw-r--r-- | src/include/utils/selfuncs.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 4fdcb07d97b..ae08a59d2b8 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -848,7 +848,7 @@ histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc, * Otherwise, fall back to the default selectivity provided by the caller. */ double -generic_restriction_selectivity(PlannerInfo *root, Oid operator, +generic_restriction_selectivity(PlannerInfo *root, Oid oproid, List *args, int varRelid, double default_selectivity) { @@ -886,7 +886,7 @@ generic_restriction_selectivity(PlannerInfo *root, Oid operator, double nullfrac; int hist_size; - fmgr_info(get_opcode(operator), &opproc); + fmgr_info(get_opcode(oproid), &opproc); /* * Calculate the selectivity for the column's most common values. diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index 1dd3ac12f8b..9690b4e4865 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -151,7 +151,7 @@ extern double histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc, Datum constval, bool varonleft, int min_hist_size, int n_skip, int *hist_size); -extern double generic_restriction_selectivity(PlannerInfo *root, Oid operator, +extern double generic_restriction_selectivity(PlannerInfo *root, Oid oproid, List *args, int varRelid, double default_selectivity); extern double ineq_histogram_selectivity(PlannerInfo *root, |