[svn:parrot] r49094 - in branches/gc_massacre/src: . string

bacek at svn.parrot.org bacek at svn.parrot.org
Fri Sep 17 23:44:07 UTC 2010


Author: bacek
Date: Fri Sep 17 23:44:06 2010
New Revision: 49094
URL: https://trac.parrot.org/parrot/changeset/49094

Log:
add casts to get g++ to build

Modified:
   branches/gc_massacre/src/hash.c
   branches/gc_massacre/src/string/api.c

Modified: branches/gc_massacre/src/hash.c
==============================================================================
--- branches/gc_massacre/src/hash.c	Fri Sep 17 23:39:13 2010	(r49093)
+++ branches/gc_massacre/src/hash.c	Fri Sep 17 23:44:06 2010	(r49094)
@@ -1465,7 +1465,7 @@
 
     if (hash->key_type == Hash_key_type_STRING) {
         const STRING * const s = (STRING *)key;
-        hashval                = key_hash_STRING(interp, s, hash->seed);
+        hashval                = key_hash_STRING(interp, (STRING *)s, hash->seed);
         bucket                 = hash->index[hashval & hash->mask];
 
         while (bucket) {

Modified: branches/gc_massacre/src/string/api.c
==============================================================================
--- branches/gc_massacre/src/string/api.c	Fri Sep 17 23:39:13 2010	(r49093)
+++ branches/gc_massacre/src/string/api.c	Fri Sep 17 23:44:06 2010	(r49094)
@@ -1001,7 +1001,7 @@
         true_length = (UINTVAL)(src_length - true_offset);
 
     if (true_length == src_length && !offset)
-        return src;
+        return (STRING *)src;
     else
         return STRING_substr(interp, src, true_offset, true_length);
 }


More information about the parrot-commits mailing list