Merge branch 'master' into gencode2

protocolbuffers · Jul 11, 2017 · 6eb489a · 6eb489a
2 parents 1278ff8 + 0af9285
commit 6eb489a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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);

diff --git a/upb/msg.h b/upb/msg.h
@@ -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