summaryrefslogtreecommitdiff
path: root/upbc
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2018-12-13 11:20:26 -0800
committerJoshua Haberman <jhaberman@gmail.com>2018-12-13 11:20:26 -0800
commitaa2d5a609bc714e90300f26e04e729a4822a2aa5 (patch)
tree31ee9e43f85cab69322daa5f1dc6e0a758208ec4 /upbc
parent10e682cf2a0e8dcfd79f9dfbad5367f6b6bf8a61 (diff)
Fixed generated code for C++.
Diffstat (limited to 'upbc')
-rw-r--r--upbc/generator.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/upbc/generator.cc b/upbc/generator.cc
index c4ab531..bb29041 100644
--- a/upbc/generator.cc
+++ b/upbc/generator.cc
@@ -340,7 +340,7 @@ void GenerateMessageInHeader(const protobuf::Descriptor* message, Output& output
if (field->is_repeated()) {
output(
"UPB_INLINE $0 const* $1_$2(const $1 *msg, size_t *len) { "
- "return _upb_array_accessor(msg, $3, len); }\n",
+ "return ($0 const*)_upb_array_accessor(msg, $3, len); }\n",
CTypeConst(field), msgname, field->name(),
GetSizeInit(layout.GetFieldOffset(field)));
} else if (field->containing_oneof()) {
@@ -366,17 +366,18 @@ void GenerateMessageInHeader(const protobuf::Descriptor* message, Output& output
if (field->is_repeated()) {
output(
"UPB_INLINE $0* $1_$2_mutable($1 *msg, size_t *len) { "
- "return _upb_array_mutable_accessor(msg, $3, len); }\n",
+ "return ($0*)_upb_array_mutable_accessor(msg, $3, len); }\n",
CType(field), msgname, field->name(),
GetSizeInit(layout.GetFieldOffset(field)));
output(
"UPB_INLINE $0* $1_$2_resize($1 *msg, size_t len, "
"upb_arena *arena) { "
- "return _upb_array_resize_accessor(msg, $3, len, $4, $5, arena); }\n",
+ "return ($0*)_upb_array_resize_accessor(msg, $3, len, $4, $5, arena); "
+ "}\n",
CType(field), msgname, field->name(),
GetSizeInit(layout.GetFieldOffset(field)),
GetSizeInit(MessageLayout::SizeOfUnwrapped(field).size),
- 0 /* TODO */);
+ "(upb_fieldtype_t)0" /* TODO */);
} else {
output("UPB_INLINE void $0_set_$1($0 *msg, $2 value) { ", msgname,
field->name(), CType(field));
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback