@@ -42,7 +42,7 @@ Maximum alignments for corresponding data types are defined in dsc.h
42
42
* value is greater than blr_blob_id, be sure to change the next define,
43
43
* and also add the required entries to all of the arrays below.
44
44
*/
45
- const unsigned char DTYPE_BLR_MAX = blr_blob_id ;
45
+ inline constexpr unsigned char DTYPE_BLR_MAX = blr_blob_id ;
46
46
47
47
/*
48
48
the blr types are defined in blr.h
@@ -54,7 +54,7 @@ No need to worry about blr_blob or ?blr_blob_id
54
54
#include "../common/dsc.h"
55
55
#include "../jrd/RecordNumber.h"
56
56
57
- static const USHORT gds_cvt_blr_dtype [DTYPE_BLR_MAX + 1 ] =
57
+ static inline constexpr USHORT gds_cvt_blr_dtype [DTYPE_BLR_MAX + 1 ] =
58
58
{
59
59
0 , 0 , 0 , 0 , 0 , 0 , 0 ,
60
60
dtype_short , /* blr_short == 7 */
@@ -88,7 +88,7 @@ static const USHORT gds_cvt_blr_dtype[DTYPE_BLR_MAX + 1] =
88
88
0 , 0 , 0 , 0
89
89
};
90
90
91
- static const USHORT type_alignments [DTYPE_TYPE_MAX ] =
91
+ static inline constexpr USHORT type_alignments [DTYPE_TYPE_MAX ] =
92
92
{
93
93
0 ,
94
94
0 , /* dtype_text */
@@ -121,7 +121,7 @@ static const USHORT type_alignments[DTYPE_TYPE_MAX] =
121
121
sizeof (GDS_DATE ) /* dtype_ex_timestamp_tz */
122
122
};
123
123
124
- static const USHORT type_lengths [DTYPE_TYPE_MAX ] =
124
+ static inline constexpr USHORT type_lengths [DTYPE_TYPE_MAX ] =
125
125
{
126
126
0 ,
127
127
0 , /* dtype_text */
@@ -157,7 +157,7 @@ static const USHORT type_lengths[DTYPE_TYPE_MAX] =
157
157
158
158
// This table is only used by gpre's cme.cpp.
159
159
// float, double are numbers from IEEE floating-point standard (IEEE 754)
160
- static const USHORT type_significant_bits [DTYPE_TYPE_MAX ] =
160
+ static inline constexpr USHORT type_significant_bits [DTYPE_TYPE_MAX ] =
161
161
{
162
162
0 ,
163
163
0 , /* dtype_text */
0 commit comments