Fix -Wparentheses in btr

+ constexpr + misc warnings

Author: mrotteveel

src/jrd/btr.cpp

@@ -73,21 +73,21 @@ using namespace Firebird;
 
 namespace
 {
-	const unsigned MAX_LEVELS = 16;
+	constexpr unsigned MAX_LEVELS = 16;
 
-	const size_t OVERSIZE = (MAX_PAGE_SIZE + BTN_PAGE_SIZE + MAX_KEY + sizeof(SLONG) - 1) / sizeof(SLONG);
+	constexpr size_t OVERSIZE = (MAX_PAGE_SIZE + BTN_PAGE_SIZE + MAX_KEY + sizeof(SLONG) - 1) / sizeof(SLONG);
 
 	// END_LEVEL (~0) is choosen here as a unknown/none value, because it's
 	// already reserved as END_LEVEL marker for page number and record number.
 	//
 	// NO_VALUE_PAGE and NO_VALUE are the same constant, but with different size
 	// Sign-extension mechanizm guaranties that they may be compared to each other safely
-	const ULONG NO_VALUE_PAGE = END_LEVEL;
+	constexpr ULONG NO_VALUE_PAGE = END_LEVEL;
 	const RecordNumber NO_VALUE(END_LEVEL);
 
 	// A split page will never have the number 0, because that's the value
 	// of the main page.
-	const ULONG NO_SPLIT	= 0;
+	inline constexpr ULONG NO_SPLIT = 0;
 
 	// Thresholds for determing of a page should be garbage collected
 	// Garbage collect if page size is below GARBAGE_COLLECTION_THRESHOLD
@@ -105,22 +105,22 @@ namespace
 	};
 
 	// I assume this wasn't done sizeof(INT64_KEY) on purpose, since alignment might affect it.
-	const size_t INT64_KEY_LENGTH = sizeof (double) + sizeof (SSHORT);
+	constexpr size_t INT64_KEY_LENGTH = sizeof (double) + sizeof (SSHORT);
 
-	const double pow10_table[] =
+	constexpr double pow10_table[] =
 	{
 		1.e00, 1.e01, 1.e02, 1.e03, 1.e04, 1.e05, 1.e06, 1.e07, 1.e08, 1.e09,
 		1.e10, 1.e11, 1.e12, 1.e13, 1.e14, 1.e15, 1.e16, 1.e17, 1.e18, 1.e19,
 		1.e20, 1.e21, 1.e22, 1.e23, 1.e24, 1.e25, 1.e26, 1.e27, 1.e28, 1.e29,
 		1.e30, 1.e31, 1.e32, 1.e33, 1.e34, 1.e35, 1.e36
 	};
 
-	inline double powerof10(int index)
+	inline double powerof10(int index) noexcept
 	{
 		return (index <= 0) ? pow10_table[-index] : 1.0 / pow10_table[index];
 	}
 
-	const struct	// Used in make_int64_key()
+	constexpr struct	// Used in make_int64_key()
 	{
 		FB_UINT64 limit;
 		SINT64 factor;
@@ -856,7 +856,7 @@ void BTR_complement_key(temporary_key* key)
 		UCHAR* p = key->key_data;
 		for (const UCHAR* const end = p + key->key_length; p < end; p++)
 			*p ^= -1;
-	} while (key = key->key_next.get());
+	} while ((key = key->key_next.get()));
 }
 
 
@@ -2810,8 +2810,8 @@ static void compress(thread_db* tdbb,
 	// is needed to make a difference between a NULL state and a VALUE.
 	// Note! By descending index key is complemented after this compression routine.
 	// Further a NULL state is always returned as 1 byte 0xFF (descending index).
-	const UCHAR desc_end_value_prefix = 0x01; // ~0xFE
-	const UCHAR desc_end_value_check = 0x00; // ~0xFF;
+	constexpr UCHAR desc_end_value_prefix = 0x01; // ~0xFE
+	constexpr UCHAR desc_end_value_check = 0x00; // ~0xFF;
 
 	const Database* dbb = tdbb->getDatabase();
 	bool first_key = true;
@@ -6478,7 +6478,7 @@ string print_key(thread_db* tdbb, jrd_rel* relation, index_desc* idx, Record* re
 		MET_scan_relation(tdbb, relation);
 	}
 
-	const FB_SIZE_T MAX_KEY_STRING_LEN = 250;
+	constexpr FB_SIZE_T MAX_KEY_STRING_LEN = 250;
 	string key, value;
 
 	try

src/jrd/btr.h

@@ -83,50 +83,50 @@ struct index_desc
 
 typedef Firebird::HalfStaticArray<index_desc, 16> IndexDescList;
 
-const USHORT idx_invalid = USHORT(~0);		// Applies to idx_id as special value
+inline constexpr USHORT idx_invalid = USHORT(~0);		// Applies to idx_id as special value
 
 // index types and flags
 
 // See jrd/intl.h for notes on idx_itype and dsc_sub_type considerations
 // idx_numeric .. idx_byte_array values are compatible with VMS values
 
-const int idx_numeric		= 0;
-const int idx_string		= 1;
+inline constexpr int idx_numeric		= 0;
+inline constexpr int idx_string			= 1;
 // value of 2 was used in ODS < 10
-const int idx_byte_array	= 3;
-const int idx_metadata		= 4;
-const int idx_sql_date		= 5;
-const int idx_sql_time		= 6;
-const int idx_timestamp		= 7;
-const int idx_numeric2		= 8;	// Introduced for 64-bit Integer support
-const int idx_boolean		= 9;
-const int idx_decimal		= 10;
-const int idx_sql_time_tz	= 11;
-const int idx_timestamp_tz	= 12;
-const int idx_bcd			= 13;	// 128-bit Integer support
+inline constexpr int idx_byte_array		= 3;
+inline constexpr int idx_metadata		= 4;
+inline constexpr int idx_sql_date		= 5;
+inline constexpr int idx_sql_time		= 6;
+inline constexpr int idx_timestamp		= 7;
+inline constexpr int idx_numeric2		= 8;	// Introduced for 64-bit Integer support
+inline constexpr int idx_boolean		= 9;
+inline constexpr int idx_decimal		= 10;
+inline constexpr int idx_sql_time_tz	= 11;
+inline constexpr int idx_timestamp_tz	= 12;
+inline constexpr int idx_bcd			= 13;	// 128-bit Integer support
 
 // idx_itype space for future expansion
-const int idx_first_intl_string	= 64;	// .. MAX (short) Range of computed key strings
+inline constexpr int idx_first_intl_string	= 64;	// .. MAX (short) Range of computed key strings
 
-const int idx_offset_intl_range	= (0x7FFF + idx_first_intl_string);
+inline constexpr int idx_offset_intl_range	= (0x7FFF + idx_first_intl_string);
 
 // these flags must match the irt_flags (see ods.h)
 
-const int idx_unique		= 1;
-const int idx_descending	= 2;
-const int idx_in_progress	= 4;
-const int idx_foreign		= 8;
-const int idx_primary		= 16;
-const int idx_expression	= 32;
-const int idx_condition		= 64;
+inline constexpr int idx_unique			= 1;
+inline constexpr int idx_descending		= 2;
+inline constexpr int idx_in_progress	= 4;
+inline constexpr int idx_foreign		= 8;
+inline constexpr int idx_primary		= 16;
+inline constexpr int idx_expression		= 32;
+inline constexpr int idx_condition		= 64;
 
 // these flags are for idx_runtime_flags
 
-const int idx_plan_dont_use	= 1;	// index is not mentioned in user-specified access plan
-const int idx_plan_navigate	= 2;	// plan specifies index to be used for ordering
-const int idx_used 			= 4;	// index was in fact selected for retrieval
-const int idx_navigate		= 8;	// index was in fact selected for navigation
-const int idx_marker		= 16;	// marker used in procedure sort_indices
+inline constexpr int idx_plan_dont_use	= 1;	// index is not mentioned in user-specified access plan
+inline constexpr int idx_plan_navigate	= 2;	// plan specifies index to be used for ordering
+inline constexpr int idx_used 			= 4;	// index was in fact selected for retrieval
+inline constexpr int idx_navigate		= 8;	// index was in fact selected for navigation
+inline constexpr int idx_marker			= 16;	// marker used in procedure sort_indices
 
 // Index insertion block -- parameter block for index insertions
 
@@ -146,7 +146,7 @@ struct index_insertion
 
 // these flags are for the key_flags
 
-const int key_empty		= 1;	// Key contains empty data / empty string
+inline constexpr int key_empty		= 1;	// Key contains empty data / empty string
 
 // Temporary key block
 
@@ -177,8 +177,8 @@ struct index_sort_record
 };
 #pragma pack()
 
-const int ISR_secondary	= 1;	// Record is secondary version
-const int ISR_null		= 2;	// Record consists of NULL values only
+inline constexpr int ISR_secondary	= 1;	// Record is secondary version
+inline constexpr int ISR_null		= 2;	// Record consists of NULL values only
 
 
 
@@ -227,21 +227,21 @@ class IndexRetrieval final
 };
 
 // Flag values for irb_generic
-const int irb_partial	= 1;				// Partial match: not all segments or starting of key only
-const int irb_starting	= 2;				// Only compute "starting with" key for index segment
-const int irb_equality	= 4;				// Probing index for equality match
-const int irb_ignore_null_value_key  = 8;	// if lower bound is specified and upper bound unspecified,
-											// ignore looking at null value keys
-const int irb_descending	= 16;			// Base index uses descending order
-const int irb_exclude_lower	= 32;			// exclude lower bound keys while scanning index
-const int irb_exclude_upper	= 64;			// exclude upper bound keys while scanning index
-const int irb_multi_starting	= 128;		// Use INTL_KEY_MULTI_STARTING
-const int irb_root_list_scan	= 256;		// Locate list items from the root
-const int irb_unique	= 512;				// Unique match (currently used only for plan output)
+inline constexpr int irb_partial	= 1;				// Partial match: not all segments or starting of key only
+inline constexpr int irb_starting	= 2;				// Only compute "starting with" key for index segment
+inline constexpr int irb_equality	= 4;				// Probing index for equality match
+inline constexpr int irb_ignore_null_value_key  = 8;	// if lower bound is specified and upper bound unspecified,
+														// ignore looking at null value keys
+inline constexpr int irb_descending	= 16;				// Base index uses descending order
+inline constexpr int irb_exclude_lower	= 32;			// exclude lower bound keys while scanning index
+inline constexpr int irb_exclude_upper	= 64;			// exclude upper bound keys while scanning index
+inline constexpr int irb_multi_starting	= 128;			// Use INTL_KEY_MULTI_STARTING
+inline constexpr int irb_root_list_scan	= 256;			// Locate list items from the root
+inline constexpr int irb_unique		= 512;				// Unique match (currently used only for plan output)
 
 // Force include flags - always include appropriate key while scanning index
-const int irb_force_lower	= irb_exclude_lower;
-const int irb_force_upper	= irb_exclude_upper;
+inline constexpr int irb_force_lower	= irb_exclude_lower;
+inline constexpr int irb_force_upper	= irb_exclude_upper;
 
 typedef Firebird::HalfStaticArray<float, 4> SelectivityList;