Avoid 'warning: use of old-style cast' in output code.

1 files changed, 25 insertions, 6 deletions

diff --git a/src/output.cc b/src/output.cc
index e60f8f7..c42fbba 100644
--- a/src/output.cc
+++ b/src/output.cc
@@ -749,15 +749,11 @@ void Output_Compare_Memcmp::output_comparison (const Output_Expr& expr1,
 
 /* ------------------------------------------------------------------------- */
 
-/* Generates a C expression for an asso_values[] reference.  */
+/* Generates a C expression for an asso_values[] index.  */
 
 void
-Output::output_asso_values_ref (int pos) const
+Output::output_asso_values_index (int pos) const
 {
-  printf ("asso_values[");
-  /* Always cast to unsigned char.  This is necessary when the alpha_inc
-     is nonzero, and also avoids a gcc warning "subscript has type 'char'".  */
-  printf ("(unsigned char)");
   if (pos == Positions::LASTCHAR)
     printf ("str[len - 1]");
   else
@@ -766,6 +762,29 @@ Output::output_asso_values_ref (int pos) const
       if (_alpha_inc[pos])
         printf ("+%u", _alpha_inc[pos]);
     }
+}
+
+/* Generates a C expression for an asso_values[] reference.  */
+
+void
+Output::output_asso_values_ref (int pos) const
+{
+  printf ("asso_values[");
+  /* Always cast to unsigned char.  This is necessary when the alpha_inc
+     is nonzero, and also avoids a gcc warning "subscript has type 'char'".  */
+  if (option[CPLUSPLUS])
+    {
+      /* In C++, a C style cast may lead to a 'warning: use of old-style cast'.
+         Therefore prefer the C++ style cast syntax.  */
+      printf ("static_cast<unsigned char>(");
+      output_asso_values_index (pos);
+      printf (")");
+    }
+  else
+    {
+      printf ("(unsigned char)");
+      output_asso_values_index (pos);
+    }
   printf ("]");
 }