Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita67a496

Browse files
committed
Rename C23 keyword
constexpr is a keyword in C23. Rename a conflicting identifier forfuture-proofing.Reviewed-by: Robert Haas <robertmhaas@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/08abc832-1384-4aca-a535-1a79765b565e%40eisentraut.org
1 parentea92f3a commita67a496

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

‎src/backend/optimizer/util/predtest.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ boolexpr_startup_fn(Node *clause, PredIterInfo info)
948948
typedefstruct
949949
{
950950
OpExpropexpr;
951-
Constconstexpr;
951+
Constconst_expr;
952952
intnext_elem;
953953
intnum_elems;
954954
Datum*elem_values;
@@ -992,13 +992,13 @@ arrayconst_startup_fn(Node *clause, PredIterInfo info)
992992
state->opexpr.args=list_copy(saop->args);
993993

994994
/* Set up a dummy Const node to hold the per-element values */
995-
state->constexpr.xpr.type=T_Const;
996-
state->constexpr.consttype=ARR_ELEMTYPE(arrayval);
997-
state->constexpr.consttypmod=-1;
998-
state->constexpr.constcollid=arrayconst->constcollid;
999-
state->constexpr.constlen=elmlen;
1000-
state->constexpr.constbyval=elmbyval;
1001-
lsecond(state->opexpr.args)=&state->constexpr;
995+
state->const_expr.xpr.type=T_Const;
996+
state->const_expr.consttype=ARR_ELEMTYPE(arrayval);
997+
state->const_expr.consttypmod=-1;
998+
state->const_expr.constcollid=arrayconst->constcollid;
999+
state->const_expr.constlen=elmlen;
1000+
state->const_expr.constbyval=elmbyval;
1001+
lsecond(state->opexpr.args)=&state->const_expr;
10021002

10031003
/* Initialize iteration state */
10041004
state->next_elem=0;
@@ -1011,8 +1011,8 @@ arrayconst_next_fn(PredIterInfo info)
10111011

10121012
if (state->next_elem >=state->num_elems)
10131013
returnNULL;
1014-
state->constexpr.constvalue=state->elem_values[state->next_elem];
1015-
state->constexpr.constisnull=state->elem_nulls[state->next_elem];
1014+
state->const_expr.constvalue=state->elem_values[state->next_elem];
1015+
state->const_expr.constisnull=state->elem_nulls[state->next_elem];
10161016
state->next_elem++;
10171017
return (Node*)&(state->opexpr);
10181018
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp