Fix -Wparentheses warnings in gpre/obj_cxx

+ constexpr

Author: mrotteveel

src/gpre/obj_cxx.cpp

@@ -132,16 +132,16 @@ static void t_start_auto(const act*, const gpre_req*, const TEXT*, int, bool);
 static bool global_first_flag = false;
 static const TEXT* global_status_name = 0;
 
-const int INDENT	= 3;
+constexpr int INDENT = 3;
 
-static const char* const NULL_STRING	= "NULL";
-static const char* const NULL_STATUS	= "NULL";
-static const char* const NULL_SQLDA		= "NULL";
+static constexpr const char* NULL_STRING	= "NULL";
+static constexpr const char* NULL_STATUS	= "NULL";
+static constexpr const char* NULL_SQLDA		= "NULL";
 
-static const char* const GDS_INCLUDE	= "<ibase.h>";
+static constexpr const char* GDS_INCLUDE	= "<ibase.h>";
 
-static const char* const DCL_LONG	= "ISC_LONG";
-static const char* const DCL_QUAD	= "ISC_QUAD";
+static constexpr const char* DCL_LONG	= "ISC_LONG";
+static constexpr const char* DCL_QUAD	= "ISC_QUAD";
 
 static inline void begin(const int column)
 {
@@ -251,6 +251,10 @@ void OBJ_CXX_action(const act* action, int column)
 	case ACT_update:
 	case ACT_statistics:
 		begin(column);
+		break;
+	default:
+		// no leading brace needed
+		break;
 	}
 
 	switch (action->act_type)
@@ -666,7 +670,7 @@ static void asgn_to( const act* action, ref* reference, int column)
 
 			// Pick up NULL value if one is there
 
-			if (reference = reference->ref_null)
+			if ((reference = reference->ref_null))
 			{
 				align(column);
 				fprintf(gpreGlob.out_file, "%s = %s;", reference->ref_value,
@@ -695,7 +699,7 @@ static void asgn_to( const act* action, ref* reference, int column)
 
 	// Pick up NULL value if one is there
 
-	if (reference = reference->ref_null)
+	if ((reference = reference->ref_null))
 	{
 		align(column);
 		fprintf(gpreGlob.out_file, "%s = %s;", reference->ref_value, gen_name(s, reference, true));
@@ -1057,7 +1061,7 @@ static void gen_blob_open( const act* action, USHORT column)
 		fprintf(gpreGlob.out_file, "%s = %s;", s, reference->ref_value);
 	}
 
-	if (args.pat_value1 = blob->blb_bpb_length)
+	if ((args.pat_value1 = blob->blb_bpb_length))
 		PATTERN_expand(column, pattern1, &args);
 	else
 		PATTERN_expand(column, pattern2, &args);
@@ -3364,7 +3368,7 @@ static void gen_t_start( const act* action, int column)
 
 	if (trans->tra_db_count == 1)
 	{
-		printa(column, "%s = %s->startTransaction(%s, %d, fb_tpb_%d);",
+`		printa(column, "%s = %s->startTransaction(%s, %d, fb_tpb_%d);",
 			trans->tra_handle ? trans->tra_handle : gpreGlob.transaction_name,
 			trans->tra_tpb->tpb_database->dbb_name->sym_string, vector,
 			trans->tra_tpb->tpb_length, trans->tra_tpb->tpb_ident);