mirror of
https://github.com/corda/corda.git
synced 2025-01-22 12:28:11 +00:00
fix merge confict fallout in heapdump.cpp
This commit is contained in:
parent
7d68c9b0a5
commit
aa7b47eec4
@ -26,7 +26,7 @@ enum {
|
||||
void
|
||||
write1(FILE* out, uint8_t v)
|
||||
{
|
||||
size_t n UNUSED = fwrite(&v, 1, 1, c->out);
|
||||
size_t n UNUSED = fwrite(&v, 1, 1, out);
|
||||
}
|
||||
|
||||
void
|
||||
@ -39,7 +39,7 @@ write4(FILE* out, uint32_t v)
|
||||
void
|
||||
writeString(FILE* out, int8_t* p, unsigned size)
|
||||
{
|
||||
write4(c, size);
|
||||
write4(out, size);
|
||||
size_t n UNUSED = fwrite(p, size, 1, out);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user