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

Compile fix for GCC 4.7.2 in C++11 mode

Browse Source
This commit is contained in:
Carsten Elton Sorensen
2012-11-30 11:14:35 +01:00
parent e4dfb79618
commit 2b44fb6b93
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/interpret.cpp
View File

@ -92,7 +92,7 @@ inline void
pushLong(Thread* t, uint64_t v) pushLong(Thread* t, uint64_t v)
{ {
if (DebugStack) { if (DebugStack) {
fprintf(stderr, "push long %"LLD" at %d\n", v, t->sp); fprintf(stderr, "push long %" LLD " at %d\n", v, t->sp);
} }
pushInt(t, v >> 32); pushInt(t, v >> 32);
@ -123,7 +123,7 @@ inline uint32_t
popInt(Thread* t) popInt(Thread* t)
{ {
if (DebugStack) { if (DebugStack) {
fprintf(stderr, "pop int %"ULD" at %d\n", fprintf(stderr, "pop int %" ULD " at %d\n",
t->stack[((t->sp - 1) * 2) + 1], t->stack[((t->sp - 1) * 2) + 1],
t->sp - 1); t->sp - 1);
} }
@ -142,7 +142,7 @@ inline uint64_t
popLong(Thread* t) popLong(Thread* t)
{ {
if (DebugStack) { if (DebugStack) {
fprintf(stderr, "pop long %"LLD" at %d\n", fprintf(stderr, "pop long %" LLD " at %d\n",
(static_cast<uint64_t>(t->stack[((t->sp - 2) * 2) + 1]) << 32) (static_cast<uint64_t>(t->stack[((t->sp - 2) * 2) + 1]) << 32)
| static_cast<uint64_t>(t->stack[((t->sp - 1) * 2) + 1]), | static_cast<uint64_t>(t->stack[((t->sp - 1) * 2) + 1]),
t->sp - 2); t->sp - 2);
@ -178,7 +178,7 @@ inline uint32_t
peekInt(Thread* t, unsigned index) peekInt(Thread* t, unsigned index)
{ {
if (DebugStack) { if (DebugStack) {
fprintf(stderr, "peek int %"ULD" at %d\n", fprintf(stderr, "peek int %" ULD " at %d\n",
t->stack[(index * 2) + 1], t->stack[(index * 2) + 1],
index); index);
} }
@ -192,7 +192,7 @@ inline uint64_t
peekLong(Thread* t, unsigned index) peekLong(Thread* t, unsigned index)
{ {
if (DebugStack) { if (DebugStack) {
fprintf(stderr, "peek long %"LLD" at %d\n", fprintf(stderr, "peek long %" LLD " at %d\n",
(static_cast<uint64_t>(t->stack[(index * 2) + 1]) << 32) (static_cast<uint64_t>(t->stack[(index * 2) + 1]) << 32)
| static_cast<uint64_t>(t->stack[((index + 1) * 2) + 1]), | static_cast<uint64_t>(t->stack[((index + 1) * 2) + 1]),
index); index);
@ -228,7 +228,7 @@ inline void
pokeLong(Thread* t, unsigned index, uint64_t value) pokeLong(Thread* t, unsigned index, uint64_t value)
{ {
if (DebugStack) { if (DebugStack) {
fprintf(stderr, "poke long %"LLD" at %d\n", value, index); fprintf(stderr, "poke long %" LLD " at %d\n", value, index);
} }
pokeInt(t, index, value >> 32); pokeInt(t, index, value >> 32);
@ -461,7 +461,7 @@ pushResult(Thread* t, unsigned returnCode, uint64_t result, bool indirect)
case DoubleField: case DoubleField:
case LongField: case LongField:
if (DebugRun) { if (DebugRun) {
fprintf(stderr, "result: %"LLD"\n", result); fprintf(stderr, "result: %" LLD "\n", result);
} }
pushLong(t, result); pushLong(t, result);
break; break;