* src/vm/jit/arm/codegen.c: Remove hack for return value in float registers.

[cacao.git] / src / vm / array.hpp

diff --git a/src/vm/array.hpp b/src/vm/array.hpp
index ced1ab3a75151b1360128ea24e85f3f80af7ef3a..d6406eae4290c76a880ed890b4cbf8e632b7504c 100644 (file)
--- a/src/vm/array.hpp
+++ b/src/vm/array.hpp
@@ -1,6 +1,6 @@
 /* src/vm/array.hpp - Java array functions
 
-   Copyright (C) 2007
+   Copyright (C) 2007, 2009, 2010
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
    Copyright (C) 2008 Theobroma Systems Ltd.
 
@@ -160,7 +160,7 @@ inline Array::Array(int32_t size, classinfo* arrayclass)
        LLNI_vftbl_direct(a) = arrayclass->vftbl;
 
 #if defined(ENABLE_THREADS)
-       a->objheader.lockword.init();
+       Lockword(a->objheader.lockword).init();
 #endif
 
        a->size = size;
@@ -312,7 +312,7 @@ class ByteArray : public ArrayTemplate<int8_t> {
 public:
        ByteArray(java_handle_bytearray_t* h) : ArrayTemplate<int8_t>(h) {}
        ByteArray(int32_t length) : ArrayTemplate<int8_t>(length, primitivetype_table[ARRAYTYPE_BYTE].arrayclass) {}
-       int8_t* get_raw_data_ptr() { return ((java_bytearray_t*) get_handle())->data; }
+       int8_t* get_raw_data_ptr() { return (int8_t*) ((java_bytearray_t*) get_handle())->data; }
 };
 
 class CharArray : public ArrayTemplate<uint16_t> {