diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2017-07-11 14:41:35 -0500 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2017-07-11 14:41:35 -0500 |
commit | 6eb489a30ab0bc4e859944650f13db7a706e27da (patch) | |
tree | 1ef24cd626e68aa05575d0b39be7b38ecd607026 | |
parent | 1278ff899409025692d6915421f1af1c99dc837e (diff) | |
parent | 0af928564ef4bb1ad3aa7cef26929bab7836f876 (diff) |
Merge branch 'master' into gencode2
-rw-r--r-- | upb/bindings/lua/msg.c | 2 | ||||
-rw-r--r-- | upb/msg.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/upb/bindings/lua/msg.c b/upb/bindings/lua/msg.c index dc8420f..e468ace 100644 --- a/upb/bindings/lua/msg.c +++ b/upb/bindings/lua/msg.c @@ -434,7 +434,7 @@ static upb_msgval lupb_tomsgval(lua_State *L, upb_fieldtype_t type, int narg, case UPB_TYPE_BYTES: { size_t len; const char *ptr = lupb_checkstring(L, narg, &len); - return upb_msgval_str(upb_stringview_make(ptr, len)); + return upb_msgval_makestr(ptr, len); } case UPB_TYPE_MESSAGE: UPB_ASSERT(lmsgclass); @@ -126,6 +126,7 @@ UPB_INLINE upb_stringview upb_stringview_make(const char *data, size_t size) { #define UPB_STRINGVIEW_INIT(ptr, len) {ptr, len} + /** upb_msgval ****************************************************************/ /* A union representing all possible protobuf values. Used for generic get/set |