mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename C23 keyword

Browse Source 
constexpr is a keyword in C23.  Rename a conflicting identifier for
future-proofing.

Reviewed-by: Robert Haas <robertmhaas@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/08abc832-1384-4aca-a535-1a79765b565e%40eisentraut.org
This commit is contained in:
Peter Eisentraut 2024-08-13 06:15:28 +02:00
parent ea92f3a0a5
commit a67a49648d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/optimizer/util/predtest.c
View File

@ -948,7 +948,7 @@ boolexpr_startup_fn(Node *clause, PredIterInfo info)
typedef struct typedef struct
{ {
OpExpr opexpr; OpExpr opexpr;
Const constexpr; Const const_expr;
int next_elem; int next_elem;
int num_elems; int num_elems;
Datum *elem_values; Datum *elem_values;
@ -992,13 +992,13 @@ arrayconst_startup_fn(Node *clause, PredIterInfo info)
state->opexpr.args = list_copy(saop->args); state->opexpr.args = list_copy(saop->args);
/* Set up a dummy Const node to hold the per-element values */ /* Set up a dummy Const node to hold the per-element values */
state->constexpr.xpr.type = T_Const; state->const_expr.xpr.type = T_Const;
state->constexpr.consttype = ARR_ELEMTYPE(arrayval); state->const_expr.consttype = ARR_ELEMTYPE(arrayval);
state->constexpr.consttypmod = -1; state->const_expr.consttypmod = -1;
state->constexpr.constcollid = arrayconst->constcollid; state->const_expr.constcollid = arrayconst->constcollid;
state->constexpr.constlen = elmlen; state->const_expr.constlen = elmlen;
state->constexpr.constbyval = elmbyval; state->const_expr.constbyval = elmbyval;
lsecond(state->opexpr.args) = &state->constexpr; lsecond(state->opexpr.args) = &state->const_expr;
/* Initialize iteration state */ /* Initialize iteration state */
state->next_elem = 0; state->next_elem = 0;
@ -1011,8 +1011,8 @@ arrayconst_next_fn(PredIterInfo info)
if (state->next_elem >= state->num_elems) if (state->next_elem >= state->num_elems)
return NULL; return NULL;
state->constexpr.constvalue = state->elem_values[state->next_elem]; state->const_expr.constvalue = state->elem_values[state->next_elem];
state->constexpr.constisnull = state->elem_nulls[state->next_elem]; state->const_expr.constisnull = state->elem_nulls[state->next_elem];
state->next_elem++; state->next_elem++;
return (Node *) &(state->opexpr); return (Node *) &(state->opexpr);
} }