Commit 9d25e1aa authored by Tom Lane's avatar Tom Lane

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 a8081860.
parent 2117c3cb
...@@ -848,7 +848,7 @@ histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc, ...@@ -848,7 +848,7 @@ histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
* Otherwise, fall back to the default selectivity provided by the caller. * Otherwise, fall back to the default selectivity provided by the caller.
*/ */
double double
generic_restriction_selectivity(PlannerInfo *root, Oid operator, generic_restriction_selectivity(PlannerInfo *root, Oid oproid,
List *args, int varRelid, List *args, int varRelid,
double default_selectivity) double default_selectivity)
{ {
...@@ -886,7 +886,7 @@ generic_restriction_selectivity(PlannerInfo *root, Oid operator, ...@@ -886,7 +886,7 @@ generic_restriction_selectivity(PlannerInfo *root, Oid operator,
double nullfrac; double nullfrac;
int hist_size; 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. * Calculate the selectivity for the column's most common values.
......
...@@ -151,7 +151,7 @@ extern double histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc, ...@@ -151,7 +151,7 @@ extern double histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
Datum constval, bool varonleft, Datum constval, bool varonleft,
int min_hist_size, int n_skip, int min_hist_size, int n_skip,
int *hist_size); 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, List *args, int varRelid,
double default_selectivity); double default_selectivity);
extern double ineq_histogram_selectivity(PlannerInfo *root, extern double ineq_histogram_selectivity(PlannerInfo *root,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment