|
39 | 39 | /* EKU: Firebird requires (S)LONG to be 32 bit */ |
40 | 40 | typedef int SLONG; |
41 | 41 | typedef unsigned int ULONG; |
42 | | - const SLONG SLONG_MIN = INT_MIN; |
43 | | - const SLONG SLONG_MAX = INT_MAX; |
| 42 | + inline constexpr SLONG SLONG_MIN = INT_MIN; |
| 43 | + inline constexpr SLONG SLONG_MAX = INT_MAX; |
44 | 44 | #elif SIZEOF_LONG == 4 |
45 | 45 | typedef long SLONG; |
46 | 46 | typedef unsigned long ULONG; |
47 | | - const SLONG SLONG_MIN = LONG_MIN; |
48 | | - const SLONG SLONG_MAX = LONG_MAX; |
| 47 | + inline constexpr SLONG SLONG_MIN = LONG_MIN; |
| 48 | + inline constexpr SLONG SLONG_MAX = LONG_MAX; |
49 | 49 | #else |
50 | 50 | #error compile_time_failure: SIZEOF_LONG not specified |
51 | 51 | #endif |
@@ -81,20 +81,20 @@ typedef FB_UINT64 ISC_UINT64; |
81 | 81 |
|
82 | 82 | typedef ISC_QUAD SQUAD; |
83 | 83 |
|
84 | | -const SQUAD NULL_BLOB = { 0, 0 }; |
| 84 | +inline constexpr SQUAD NULL_BLOB = { 0, 0 }; |
85 | 85 |
|
86 | | -inline bool operator==(const SQUAD& s1, const SQUAD& s2) |
| 86 | +inline bool operator==(const SQUAD& s1, const SQUAD& s2) noexcept |
87 | 87 | { |
88 | 88 | return s1.gds_quad_high == s2.gds_quad_high && |
89 | 89 | s2.gds_quad_low == s1.gds_quad_low; |
90 | 90 | } |
91 | 91 |
|
92 | | -inline bool operator!=(const SQUAD& s1, const SQUAD& s2) |
| 92 | +inline bool operator!=(const SQUAD& s1, const SQUAD& s2) noexcept |
93 | 93 | { |
94 | 94 | return !(s1 == s2); |
95 | 95 | } |
96 | 96 |
|
97 | | -inline bool operator>(const SQUAD& s1, const SQUAD& s2) |
| 97 | +inline bool operator>(const SQUAD& s1, const SQUAD& s2) noexcept |
98 | 98 | { |
99 | 99 | return (s1.gds_quad_high > s2.gds_quad_high) || |
100 | 100 | (s1.gds_quad_high == s2.gds_quad_high && |
|
0 commit comments