rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apparently some compilers don't want to automatically cast size_t to uint64_t.

Browse Source
This commit is contained in:
Petteri Aimonen
2012-07-05 18:27:07 +03:00
parent efef38cf78
commit 01a1556898
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pb_encode.c
View File

@@ -110,7 +110,7 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
size = sizestream.bytes_written; size = sizestream.bytes_written;
} }
if (!pb_encode_varint(stream, size)) if (!pb_encode_varint(stream, (uint64_t)size))
return false; return false;
if (stream->callback == NULL) if (stream->callback == NULL)
@@ -269,7 +269,7 @@ bool checkreturn pb_encode_fixed64(pb_ostream_t *stream, const void *value)
bool checkreturn pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, int field_number) bool checkreturn pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, int field_number)
{ {
int tag = wiretype | (field_number << 3); int tag = wiretype | (field_number << 3);
return pb_encode_varint(stream, tag); return pb_encode_varint(stream, (uint64_t)tag);
} }
bool checkreturn pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_t *field) bool checkreturn pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_t *field)
@@ -305,7 +305,7 @@ bool checkreturn pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_t
bool checkreturn pb_encode_string(pb_ostream_t *stream, const uint8_t *buffer, size_t size) bool checkreturn pb_encode_string(pb_ostream_t *stream, const uint8_t *buffer, size_t size)
{ {
if (!pb_encode_varint(stream, size)) if (!pb_encode_varint(stream, (uint64_t)size))
return false; return false;
return pb_write(stream, buffer, size); return pb_write(stream, buffer, size);
@@ -323,7 +323,7 @@ bool checkreturn pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fie
size = substream.bytes_written; size = substream.bytes_written;
if (!pb_encode_varint(stream, size)) if (!pb_encode_varint(stream, (uint64_t)size))
return false; return false;
if (stream->callback == NULL) if (stream->callback == NULL)