constexpr in common.h and msg.h

+ remove some commented out definitions handled elsewhere

Author: mrotteveel

src/common/common.h

@@ -94,14 +94,6 @@
 #define FB_CC CcIcc
 #endif
 
-// SLONG is a 32-bit integer on 64-bit platforms
-//#if SIZEOF_LONG == 4
-//#define SLONGFORMAT "ld"
-//#define ULONGFORMAT "lu"
-//#define XLONGFORMAT "lX"
-//#define xLONGFORMAT "lx"
-//#endif
-
 // format for size_t
 #ifndef SIZEFORMAT
 #define SIZEFORMAT "zi"
@@ -230,11 +222,6 @@
 //format for __LINE__
 #define LINEFORMAT "d"
 
-//#define SLONGFORMAT	"ld"
-//#define ULONGFORMAT "lu"
-//#define XLONGFORMAT "lX"
-//#define xLONGFORMAT "lx"
-
 #define FB_CC CcGcc
 
 #define UNIX
@@ -541,10 +528,6 @@ extern "C" int remove(const char* path);
 #endif
 
 #define SYS_ERR		Arg::Windows
-//#define SLONGFORMAT "ld"
-//#define ULONGFORMAT "lu"
-//#define XLONGFORMAT "lX"
-//#define xLONGFORMAT "lx"
 
 //format for __LINE__
 #define LINEFORMAT "d"
@@ -955,11 +938,11 @@ void GDS_breakpoint(int);
 
 // Used in quad operations
 #ifndef WORDS_BIGENDIAN
-const int LOW_WORD		= 0;
-const int HIGH_WORD		= 1;
+inline constexpr int LOW_WORD	= 0;
+inline constexpr int HIGH_WORD	= 1;
 #else
-const int LOW_WORD		= 1;
-const int HIGH_WORD		= 0;
+inline constexpr int LOW_WORD	= 1;
+inline constexpr int HIGH_WORD	= 0;
 #endif
 
 #ifndef HAVE_WORKING_VFORK
@@ -976,7 +959,7 @@ const int HIGH_WORD		= 0;
 #endif
 
 
-inline const TEXT FB_SHORT_MONTHS[][4] =
+inline constexpr TEXT FB_SHORT_MONTHS[][4] =
 {
 	"Jan", "Feb", "Mar",
 	"Apr", "May", "Jun",
@@ -985,7 +968,7 @@ inline const TEXT FB_SHORT_MONTHS[][4] =
 	"\0"
 };
 
-inline const TEXT* const FB_LONG_MONTHS_UPPER[] =
+inline constexpr const TEXT* FB_LONG_MONTHS_UPPER[] =
 {
 	"JANUARY",
 	"FEBRUARY",
@@ -1003,7 +986,7 @@ inline const TEXT* const FB_LONG_MONTHS_UPPER[] =
 };
 
 // Starts with SUNDAY cuz tm.tm_wday starts with it
-inline const TEXT FB_SHORT_DAYS[][4] =
+inline constexpr TEXT FB_SHORT_DAYS[][4] =
 {
 	"Sun",
 	"Mon",
@@ -1016,7 +999,7 @@ inline const TEXT FB_SHORT_DAYS[][4] =
 };
 
 // Starts with SUNDAY cuz tm.tm_wday starts with it
-inline const TEXT* const FB_LONG_DAYS_UPPER[] =
+inline constexpr const TEXT* FB_LONG_DAYS_UPPER[] =
 {
 	"SUNDAY",
 	"MONDAY",
@@ -1028,7 +1011,7 @@ inline const TEXT* const FB_LONG_DAYS_UPPER[] =
 	"\0"
 };
 
-const FB_SIZE_T FB_MAX_SIZEOF = ~FB_SIZE_T(0); // Assume FB_SIZE_T is unsigned
+inline constexpr FB_SIZE_T FB_MAX_SIZEOF = ~FB_SIZE_T(0); // Assume FB_SIZE_T is unsigned
 
 inline constexpr FB_SIZE_T fb_strlen(const char* str)
 {

src/yvalve/msg.h

@@ -26,11 +26,11 @@
 #define JRD_MSG_H
 
 #define MSG_NUMBER(facility, code)	((SLONG) facility * 10000 + code)
-const USHORT MSG_BUCKET			= 1024;
-const UCHAR MSG_MAJOR_VERSION	= 1;
+inline constexpr USHORT MSG_BUCKET			= 1024;
+inline constexpr UCHAR MSG_MAJOR_VERSION	= 1;
 // trick to silence the compiler when FB_MSG_MINOR_VERSION is 0
 #define FB_MSG_MINOR_VERSION	1
-const UCHAR MSG_MINOR_VERSION	= FB_MSG_MINOR_VERSION;
+inline constexpr UCHAR MSG_MINOR_VERSION	= FB_MSG_MINOR_VERSION;
 
 // Message file header block