Merged with tip.

[cacao.git] / src / vm / string.c

diff --git a/src/vm/string.c b/src/vm/string.c
index f24e411e021c0c35c86777787ab5dbf063f56f98..74400828214dddca58a96e3403a2af24e4842b42 100644 (file)
--- a/src/vm/string.c
+++ b/src/vm/string.c
@@ -45,7 +45,7 @@
 #include "vm/array.h"
 #include "vm/builtin.h"
 #include "vm/exceptions.h"
-#include "vm/primitive.h"
+#include "vm/primitive.hpp"
 #include "vm/stringlocal.h"
 #include "vm/vm.h"
 
@@ -141,7 +141,7 @@ void stringtable_update(void)
                                if (!a->header.objheader.vftbl) 
                                        /* vftbl of character-array is NULL */ 
                                        a->header.objheader.vftbl =
-                                               primitive_arrayclass_get_by_type(ARRAYTYPE_CHAR)->vftbl;
+                                               Primitive_get_arrayclass_by_type(ARRAYTYPE_CHAR)->vftbl;
 
                                /* follow link in external hash chain */
                                s = s->hashlink;
@@ -589,7 +589,7 @@ static java_object_t *literalstring_u2(java_chararray_t *a, u4 length,
     /* location in hashtable found, complete arrayheader */
 
     ca->header.objheader.vftbl =
-               primitive_arrayclass_get_by_type(ARRAYTYPE_CHAR)->vftbl;
+               Primitive_get_arrayclass_by_type(ARRAYTYPE_CHAR)->vftbl;
     ca->header.size            = length;
 
        assert(class_java_lang_String);