ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-02 17:21:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix merge fallout

Browse Source
This commit is contained in:
Joel Dice 2013-02-22 14:50:15 -07:00
parent 9060a31348
commit 5e65468fef
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/classpath-android.cpp
View File

@ -18,8 +18,6 @@ extern "C" int JNI_OnLoad(JavaVM*, void*);
#include "classpath-common.h" #include "classpath-common.h"
#include "process.h" #include "process.h"
#include "util/runtime-array.h"
using namespace vm; using namespace vm;
namespace { namespace {

16
src/classpath-common.h
View File

@ -341,14 +341,14 @@ resolveClassBySpec(Thread* t, object loader, const char* spec,
THREAD_RUNTIME_ARRAY(t, char, s, specLength - 1); THREAD_RUNTIME_ARRAY(t, char, s, specLength - 1);
memcpy(RUNTIME_ARRAY_BODY(s), spec + 1, specLength - 2); memcpy(RUNTIME_ARRAY_BODY(s), spec + 1, specLength - 2);
RUNTIME_ARRAY_BODY(s)[specLength - 2] = 0; RUNTIME_ARRAY_BODY(s)[specLength - 2] = 0;
return resolveClass(t, loader, s); return resolveClass(t, loader, RUNTIME_ARRAY_BODY(s));
} }
case '[': { case '[': {
THREAD_RUNTIME_ARRAY(t, char, s, specLength + 1); THREAD_RUNTIME_ARRAY(t, char, s, specLength + 1);
memcpy(RUNTIME_ARRAY_BODY(s), spec, specLength); memcpy(RUNTIME_ARRAY_BODY(s), spec, specLength);
RUNTIME_ARRAY_BODY(s)[specLength] = 0; RUNTIME_ARRAY_BODY(s)[specLength] = 0;
return resolveClass(t, loader, s); return resolveClass(t, loader, RUNTIME_ARRAY_BODY(s));
} }
default: default:
@ -510,9 +510,10 @@ invoke(Thread* t, object method, object instance, object args)
unsigned specLength = byteArrayLength(t, methodSpec(t, method)); unsigned specLength = byteArrayLength(t, methodSpec(t, method));
THREAD_RUNTIME_ARRAY(t, char, spec, specLength); THREAD_RUNTIME_ARRAY(t, char, spec, specLength);
memcpy(spec, &byteArrayBody(t, methodSpec(t, method), 0), specLength); memcpy(RUNTIME_ARRAY_BODY(spec),
&byteArrayBody(t, methodSpec(t, method), 0), specLength);
unsigned i = 0; unsigned i = 0;
for (MethodSpecIterator it(t, spec); it.hasNext();) { for (MethodSpecIterator it(t, RUNTIME_ARRAY_BODY(spec)); it.hasNext();) {
object type; object type;
bool objectType = false; bool objectType = false;
const char* p = it.next(); const char* p = it.next();
@ -531,10 +532,11 @@ invoke(Thread* t, object method, object instance, object args)
objectType = true; objectType = true;
unsigned nameLength = it.s - p; unsigned nameLength = it.s - p;
THREAD_RUNTIME_ARRAY(t, char, name, nameLength); THREAD_RUNTIME_ARRAY(t, char, name, nameLength);
memcpy(name, p, nameLength - 1); memcpy(RUNTIME_ARRAY_BODY(name), p, nameLength - 1);
name[nameLength - 1] = 0; RUNTIME_ARRAY_BODY(name)[nameLength - 1] = 0;
type = resolveClass type = resolveClass
(t, classLoader(t, methodClass(t, method)), name); (t, classLoader(t, methodClass(t, method)),
RUNTIME_ARRAY_BODY(name));
} break; } break;
default: default: