diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2019-01-15 06:54:54 -0800 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2019-01-15 06:54:54 -0800 |
commit | 9ae5a3af5be8650950c9647b121f23c3a8ae8e83 (patch) | |
tree | 8e6837bbeb38202d7591453ecf6fa22f1850761e /upb/bindings | |
parent | 1508648f30cbaf5a3590572b2313fb5b595a7946 (diff) | |
parent | 9ea6bb467810b958c8c2fb0bcf96d0af2b243801 (diff) |
Merge branch 'arrayapi' into defcleanup
Diffstat (limited to 'upb/bindings')
-rw-r--r-- | upb/bindings/lua/def.c | 4 | ||||
-rw-r--r-- | upb/bindings/lua/upb/pb.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/upb/bindings/lua/def.c b/upb/bindings/lua/def.c index c38b6d1..e16d426 100644 --- a/upb/bindings/lua/def.c +++ b/upb/bindings/lua/def.c @@ -639,8 +639,8 @@ static int lupb_symtab_add(lua_State *L) { lupb_arena_new(L); arena = lupb_arena_check(L, -1); - set = google_protobuf_FileDescriptorSet_parsenew( - upb_stringview_make(str, len), arena); + set = google_protobuf_FileDescriptorSet_parsenew(upb_strview_make(str, len), + arena); if (!set) { luaL_argerror(L, 2, "failed to parse descriptor"); diff --git a/upb/bindings/lua/upb/pb.c b/upb/bindings/lua/upb/pb.c index 2edefe0..e60dcde 100644 --- a/upb/bindings/lua/upb/pb.c +++ b/upb/bindings/lua/upb/pb.c @@ -16,7 +16,7 @@ static int lupb_pb_decode(lua_State *L) { const upb_msglayout *layout; upb_msg *msg = lupb_msg_checkmsg2(L, 1, &layout); const char *pb = lua_tolstring(L, 2, &len); - upb_stringview buf = upb_stringview_make(pb, len); + upb_strview buf = upb_strview_make(pb, len); upb_decode(buf, msg, layout); /* TODO(haberman): check for error. */ |