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

Merge remote-tracking branch 'origin/master' into dicej-master

Browse Source
This commit is contained in:
Joel Dice 2012-07-09 16:48:30 -06:00
commit d8483d720d
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common.h
View File

@ -145,7 +145,11 @@ typedef intptr_t __attribute__((__may_alias__)) intptr_alias_t;
# define LLD "I64d"
# define ULD "I64x"
# else
# define LLD "ld"
# ifdef __APPLE__
# define LLD "lld"
# else
# define LLD "ld"
# endif
# define ULD "lu"
# endif
#else

9
src/interpret.cpp
View File

@ -2819,15 +2819,6 @@ pushArguments(Thread* t, object this_, const char* spec, object a)
}
}
inline unsigned
returnCode(Thread* t, object method)
{
const char* s = reinterpret_cast<const char*>
(&byteArrayBody(t, methodSpec(t, method), 0));
while (*s and *s != ')') ++ s;
return fieldCode(t, s[1]);
}
object
invoke(Thread* t, object method)
{