From 9d25e1aa311c0f0c77155382e6608545b7bf579c Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 21 Apr 2020 11:21:15 -0400 Subject: 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. --- src/backend/utils/adt/selfuncs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backend/utils/adt/selfuncs.c') 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. -- cgit v1.2.3