diff options
Diffstat (limited to 'libjava/prims.cc')
| -rw-r--r-- | libjava/prims.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libjava/prims.cc b/libjava/prims.cc index b6ac7f87b81..c6b8d2030e1 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -411,8 +411,10 @@ _Jv_NewObjectArray (jsize count, jclass elementClass, jobject init) obj = (jobjectArray) _Jv_AllocArray (size, klass); if (__builtin_expect (! obj, false)) JvThrow (no_memory); - obj->length = count; - jobject *ptr = elements (obj); + // Cast away const. + jsize *lp = const_cast<jsize *> (&obj->length); + *lp = count; + jobject *ptr = elements(obj); // We know the allocator returns zeroed memory. So don't bother // zeroing it again. if (init) @@ -446,7 +448,9 @@ _Jv_NewPrimArray (jclass eltype, jint count) __JArray *arr = (__JArray*) _Jv_AllocObj (size + elsize * count, klass); if (__builtin_expect (! arr, false)) JvThrow (no_memory); - arr->length = count; + // Cast away const. + jsize *lp = const_cast<jsize *> (&arr->length); + *lp = count; // Note that we assume we are given zeroed memory by the allocator. return arr; |
