constexpr in idx

mrotteveel · mrotteveel · commit 54d538c87b0a · 2025-08-04T11:48:22.000+02:00
diff --git a/src/jrd/idx.h b/src/jrd/idx.h
@@ -30,7 +30,7 @@
 /* Indices to be created */
 
 /* Maximum number of segments in any existing system index */
-const int  INI_IDX_MAX_SEGMENTS		= 4;
+inline constexpr int INI_IDX_MAX_SEGMENTS = 4;
 
 struct ini_idx_t
 {
@@ -58,7 +58,7 @@ using Jrd::idx_timestamp_tz;
 #define INDEX(id, rel, unique, count, ods) {(id), (UCHAR) (rel), (unique), (count), (ods), {
 #define SEGMENT(fld, type) {(fld), (type)}
 
-static const struct ini_idx_t indices[] =
+static inline constexpr struct ini_idx_t indices[] =
 {
 	// define index RDB$INDEX_0 for RDB$RELATIONS unique RDB$SCHEMA_NAME, RDB$RELATION_NAME;
 	INDEX(0, rel_relations, idx_unique, 2, ODS_14_0)

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`/* Indices to be created */`
`31`	`31`
`32`	`32`	`/* Maximum number of segments in any existing system index */`
`33`		`-const int INI_IDX_MAX_SEGMENTS = 4;`
	`33`	`+inline constexpr int INI_IDX_MAX_SEGMENTS = 4;`
`34`	`34`
`35`	`35`	`struct ini_idx_t`
`36`	`36`	`{`
`@@ -58,7 +58,7 @@ using Jrd::idx_timestamp_tz;`
`58`	`58`	`#define INDEX(id, rel, unique, count, ods) {(id), (UCHAR) (rel), (unique), (count), (ods), {`
`59`	`59`	`#define SEGMENT(fld, type) {(fld), (type)}`
`60`	`60`
`61`		`-static const struct ini_idx_t indices[] =`
	`61`	`+static inline constexpr struct ini_idx_t indices[] =`
`62`	`62`	`{`
`63`	`63`	`// define index RDB$INDEX_0 for RDB$RELATIONS unique RDB$SCHEMA_NAME, RDB$RELATION_NAME;`
`64`	`64`	`INDEX(0, rel_relations, idx_unique, 2, ODS_14_0)`