constexpr in Database

Author: mrotteveel

src/jrd/Database.h

@@ -209,38 +209,38 @@ typedef vec<TraNumber> TransactionsVector;
 //
 // bit values for dbb_flags
 //
-const ULONG DBB_damaged					= 0x1L;
-const ULONG DBB_exclusive				= 0x2L;			// Database is accessed in exclusive mode
-const ULONG DBB_bugcheck				= 0x4L;			// Bugcheck has occurred
-const ULONG DBB_garbage_collector		= 0x8L;			// garbage collector thread exists
-const ULONG DBB_gc_active				= 0x10L;		// ... and is actively working.
-const ULONG DBB_gc_pending				= 0x20L;		// garbage collection requested
-const ULONG DBB_force_write				= 0x40L;		// Database is forced write
-const ULONG DBB_no_reserve				= 0x80L;		// No reserve space for versions
-const ULONG DBB_DB_SQL_dialect_3		= 0x100L;		// database SQL dialect 3
-const ULONG DBB_read_only				= 0x200L;		// DB is ReadOnly (RO). If not set, DB is RW
-const ULONG DBB_being_opened_read_only	= 0x400L;		// DB is being opened RO. If unset, opened as RW
-const ULONG DBB_no_ast					= 0x800L;		// AST delivery is prohibited
-const ULONG DBB_sweep_in_progress		= 0x1000L;		// A database sweep operation is in progress
-const ULONG DBB_gc_starting				= 0x2000L;		// garbage collector thread is starting
-const ULONG DBB_suspend_bgio			= 0x4000L;		// Suspend I/O by background threads
-const ULONG DBB_new						= 0x8000L;		// Database object is just created
-const ULONG DBB_gc_cooperative			= 0x10000L;		// cooperative garbage collection
-const ULONG DBB_gc_background			= 0x20000L;		// background garbage collection by gc_thread
-const ULONG DBB_sweep_starting			= 0x40000L;		// Auto-sweep is starting
-const ULONG DBB_creating				= 0x80000L;		// Database creation is in progress
-const ULONG DBB_shared					= 0x100000L;	// Database object is shared among connections
-const ULONG DBB_restoring				= 0x200000L;	// Database restore is in progress
+inline constexpr ULONG DBB_damaged					= 0x1L;
+inline constexpr ULONG DBB_exclusive				= 0x2L;			// Database is accessed in exclusive mode
+inline constexpr ULONG DBB_bugcheck					= 0x4L;			// Bugcheck has occurred
+inline constexpr ULONG DBB_garbage_collector		= 0x8L;			// garbage collector thread exists
+inline constexpr ULONG DBB_gc_active				= 0x10L;		// ... and is actively working.
+inline constexpr ULONG DBB_gc_pending				= 0x20L;		// garbage collection requested
+inline constexpr ULONG DBB_force_write				= 0x40L;		// Database is forced write
+inline constexpr ULONG DBB_no_reserve				= 0x80L;		// No reserve space for versions
+inline constexpr ULONG DBB_DB_SQL_dialect_3			= 0x100L;		// database SQL dialect 3
+inline constexpr ULONG DBB_read_only				= 0x200L;		// DB is ReadOnly (RO). If not set, DB is RW
+inline constexpr ULONG DBB_being_opened_read_only	= 0x400L;		// DB is being opened RO. If unset, opened as RW
+inline constexpr ULONG DBB_no_ast					= 0x800L;		// AST delivery is prohibited
+inline constexpr ULONG DBB_sweep_in_progress		= 0x1000L;		// A database sweep operation is in progress
+inline constexpr ULONG DBB_gc_starting				= 0x2000L;		// garbage collector thread is starting
+inline constexpr ULONG DBB_suspend_bgio				= 0x4000L;		// Suspend I/O by background threads
+inline constexpr ULONG DBB_new						= 0x8000L;		// Database object is just created
+inline constexpr ULONG DBB_gc_cooperative			= 0x10000L;		// cooperative garbage collection
+inline constexpr ULONG DBB_gc_background			= 0x20000L;		// background garbage collection by gc_thread
+inline constexpr ULONG DBB_sweep_starting			= 0x40000L;		// Auto-sweep is starting
+inline constexpr ULONG DBB_creating					= 0x80000L;		// Database creation is in progress
+inline constexpr ULONG DBB_shared					= 0x100000L;	// Database object is shared among connections
+inline constexpr ULONG DBB_restoring				= 0x200000L;	// Database restore is in progress
 
 //
 // dbb_ast_flags
 //
-const ULONG DBB_blocking			= 0x1L;		// Exclusive mode is blocking
-const ULONG DBB_get_shadows			= 0x2L;		// Signal received to check for new shadows
-const ULONG DBB_assert_locks		= 0x4L;		// Locks are to be asserted
-const ULONG DBB_shut_attach			= 0x8L;		// No new attachments accepted
-const ULONG DBB_shut_tran			= 0x10L;	// No new transactions accepted
-const ULONG DBB_shut_force			= 0x20L;	// Forced shutdown in progress
+inline constexpr ULONG DBB_blocking		= 0x1L;		// Exclusive mode is blocking
+inline constexpr ULONG DBB_get_shadows	= 0x2L;		// Signal received to check for new shadows
+inline constexpr ULONG DBB_assert_locks	= 0x4L;		// Locks are to be asserted
+inline constexpr ULONG DBB_shut_attach	= 0x8L;		// No new attachments accepted
+inline constexpr ULONG DBB_shut_tran	= 0x10L;	// No new transactions accepted
+inline constexpr ULONG DBB_shut_force	= 0x20L;	// Forced shutdown in progress
 
 class Database : public pool_alloc<type_dbb>
 {