mirror of
https://github.com/corda/corda.git
synced 2025-06-18 07:08:15 +00:00
fix merge confict fallout in heapdump.cpp
This commit is contained in:
@ -26,7 +26,7 @@ enum {
|
|||||||
void
|
void
|
||||||
write1(FILE* out, uint8_t v)
|
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
|
void
|
||||||
@ -39,7 +39,7 @@ write4(FILE* out, uint32_t v)
|
|||||||
void
|
void
|
||||||
writeString(FILE* out, int8_t* p, unsigned size)
|
writeString(FILE* out, int8_t* p, unsigned size)
|
||||||
{
|
{
|
||||||
write4(c, size);
|
write4(out, size);
|
||||||
size_t n UNUSED = fwrite(p, size, 1, out);
|
size_t n UNUSED = fwrite(p, size, 1, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user