ChangeLogTag:Thu Jun 19 14:52:05 UTC 2003 Don Hinton <dhinton@dresystems.com>

6 files changed, 25 insertions, 16 deletions

diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index ad8564a8391..0293e89bcb5 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jun 19 14:52:05 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * tests/test-1.exp:
+        * tests/test-2.exp:
+        * tests/test-3.exp:
+        * tests/test-4.exp:
+        * tests/test-5.exp:
+          Added (int) casts to expected results to match the new output.
+
 Tue Jun 17 11:38:36 2003  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
 
 	* src/Key_List.cpp (output_lookup_array): 
diff --git a/apps/gperf/tests/test-1.exp b/apps/gperf/tests/test-1.exp
index b0d815f52f0..af000be2831 100644
--- a/apps/gperf/tests/test-1.exp
+++ b/apps/gperf/tests/test-1.exp
@@ -69,12 +69,12 @@ hash (str, len)
     {
       default:
       case 3:
-        hval += asso_values[str[2]];
+        hval += asso_values[(int) str[2]];
       case 2:
       case 1:
-        hval += asso_values[str[0]];
+        hval += asso_values[(int) str[0]];
     }
-  return hval + asso_values[str[len - 1]];
+  return hval + asso_values[(int) str[len - 1]];
 }
 
 struct resword *
diff --git a/apps/gperf/tests/test-2.exp b/apps/gperf/tests/test-2.exp
index 52ed9e9fbf4..c911e2791ec 100644
--- a/apps/gperf/tests/test-2.exp
+++ b/apps/gperf/tests/test-2.exp
@@ -67,21 +67,21 @@ hash (str, len)
     {
       default:
       case 8:
-        hval += asso_values[str[7]];
+        hval += asso_values[(int) str[7]];
       case 7:
-        hval += asso_values[str[6]];
+        hval += asso_values[(int) str[6]];
       case 6:
-        hval += asso_values[str[5]];
+        hval += asso_values[(int) str[5]];
       case 5:
-        hval += asso_values[str[4]];
+        hval += asso_values[(int) str[4]];
       case 4:
-        hval += asso_values[str[3]];
+        hval += asso_values[(int) str[3]];
       case 3:
-        hval += asso_values[str[2]];
+        hval += asso_values[(int) str[2]];
       case 2:
-        hval += asso_values[str[1]];
+        hval += asso_values[(int) str[1]];
       case 1:
-        hval += asso_values[str[0]];
+        hval += asso_values[(int) str[0]];
     }
   return hval;
 }
diff --git a/apps/gperf/tests/test-3.exp b/apps/gperf/tests/test-3.exp
index 7762cd131ba..7ea59af01fe 100644
--- a/apps/gperf/tests/test-3.exp
+++ b/apps/gperf/tests/test-3.exp
@@ -68,13 +68,13 @@ hash (const char *str, unsigned int len)
     {
       default:
       case 4:
-        hval += asso_values[str[3]];
+        hval += asso_values[(int) str[3]];
       case 3:
       case 2:
       case 1:
-        hval += asso_values[str[0]];
+        hval += asso_values[(int) str[0]];
     }
-  return hval + asso_values[str[len - 1]];
+  return hval + asso_values[(int) str[len - 1]];
 }
 
 inline
diff --git a/apps/gperf/tests/test-4.exp b/apps/gperf/tests/test-4.exp
index 1ba3701042f..a6077d4fd69 100644
--- a/apps/gperf/tests/test-4.exp
+++ b/apps/gperf/tests/test-4.exp
@@ -63,7 +63,7 @@ hash (str, len)
      83, 83, 83, 83, 83, 83, 83, 83,
 #endif /* ACE_MVS */
     };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
+  return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
 }
 
 struct resword *
diff --git a/apps/gperf/tests/test-5.exp b/apps/gperf/tests/test-5.exp
index 3b8103dbc68..56143fbd915 100644
--- a/apps/gperf/tests/test-5.exp
+++ b/apps/gperf/tests/test-5.exp
@@ -72,7 +72,7 @@ hash (str, len)
      44,  0, 44, 44, 44, 44, 44, 44,
 #endif /* ACE_MVS */
     };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
+  return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
 }
 
 inline