mirror of
https://github.com/postgres/postgres.git
synced 2025-06-29 10:41:53 +03:00
Fix C++ compile failures in headers.
Avoid using "typeid" as a parameter name in header files, since that is a C++ keyword. These cases were introduced recently, in04fe805a1
and586b98fdf
. Since I'm an incurable neatnik, also rename these parameters in the underlying function definitions. That's not really necessary per project rules, but I don't like function declarations that don't quite agree with the underlying definitions. Per src/tools/pginclude/cpluspluscheck.
This commit is contained in:
@ -2589,13 +2589,13 @@ record_plan_function_dependency(PlannerInfo *root, Oid funcid)
|
||||
* someday fix_expr_common might call it.
|
||||
*/
|
||||
void
|
||||
record_plan_type_dependency(PlannerInfo *root, Oid typeid)
|
||||
record_plan_type_dependency(PlannerInfo *root, Oid typid)
|
||||
{
|
||||
/*
|
||||
* As in record_plan_function_dependency, ignore the possibility that
|
||||
* someone would change a built-in domain.
|
||||
*/
|
||||
if (typeid >= (Oid) FirstBootstrapObjectId)
|
||||
if (typid >= (Oid) FirstBootstrapObjectId)
|
||||
{
|
||||
PlanInvalItem *inval_item = makeNode(PlanInvalItem);
|
||||
|
||||
@ -2606,7 +2606,7 @@ record_plan_type_dependency(PlannerInfo *root, Oid typeid)
|
||||
*/
|
||||
inval_item->cacheId = TYPEOID;
|
||||
inval_item->hashValue = GetSysCacheHashValue1(TYPEOID,
|
||||
ObjectIdGetDatum(typeid));
|
||||
ObjectIdGetDatum(typid));
|
||||
|
||||
root->glob->invalItems = lappend(root->glob->invalItems, inval_item);
|
||||
}
|
||||
|
Reference in New Issue
Block a user