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

Merge branch 'master' of oss:/var/local/git/avian into dynamic

Browse Source
This commit is contained in:
Joel Dice 2008-04-02 06:58:19 -06:00
commit 3915371897
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jnienv.cpp
View File

@ -102,7 +102,7 @@ GetStringChars(Thread* t, jstring s, jboolean* isCopy)
jchar* chars = static_cast<jchar*> jchar* chars = static_cast<jchar*>
(t->m->heap->allocate((stringLength(t, *s) + 1) * sizeof(jchar), false)); (t->m->heap->allocate((stringLength(t, *s) + 1) * sizeof(jchar), false));
stringChars(t, *s, reinterpret_cast<wchar_t*>(chars)); stringChars(t, *s, chars);
if (isCopy) *isCopy = true; if (isCopy) *isCopy = true;
return chars; return chars;

4
src/machine.cpp
View File

@ -2154,7 +2154,7 @@ stringChars(Thread* t, object string, char* chars)
} }
void void
stringChars(Thread* t, object string, wchar_t* chars) stringChars(Thread* t, object string, uint16_t* chars)
{ {
object data = stringData(t, string); object data = stringData(t, string);
if (objectClass(t, data) if (objectClass(t, data)
@ -2166,7 +2166,7 @@ stringChars(Thread* t, object string, wchar_t* chars)
} else { } else {
memcpy(chars, memcpy(chars,
&charArrayBody(t, data, stringOffset(t, string)), &charArrayBody(t, data, stringOffset(t, string)),
stringLength(t, string) * sizeof(wchar_t)); stringLength(t, string) * sizeof(uint16_t));
} }
chars[stringLength(t, string)] = 0; chars[stringLength(t, string)] = 0;
} }

2
src/machine.h
View File

@ -1704,7 +1704,7 @@ void
stringChars(Thread* t, object string, char* chars); stringChars(Thread* t, object string, char* chars);
void void
stringChars(Thread* t, object string, wchar_t* chars); stringChars(Thread* t, object string, uint16_t* chars);
bool bool
isAssignableFrom(Thread* t, object a, object b); isAssignableFrom(Thread* t, object a, object b);