Responded to CR comments.

pull/13171/head
Josh Haberman 8 years ago
parent af79bfb919
commit 5a49a33605
  1. 3
      upb/descriptor/reader.c
  2. 2
      upb/refcounted.h

@ -651,7 +651,6 @@ static void *msg_startext(void *closure, const void *hd) {
return r; return r;
} }
#include <stdio.h>
static void *msg_startfield(void *closure, const void *hd) { static void *msg_startfield(void *closure, const void *hd) {
upb_descreader *r = closure; upb_descreader *r = closure;
r->f = upb_fielddef_new(&r->f); r->f = upb_fielddef_new(&r->f);
@ -667,6 +666,8 @@ static bool msg_endfield(void *closure, const void *hd) {
bool ok; bool ok;
UPB_UNUSED(hd); UPB_UNUSED(hd);
/* Oneof fields are added to the msgdef through their oneof, so don't need to
* be added here. */
if (upb_fielddef_containingoneof(r->f) == NULL) { if (upb_fielddef_containingoneof(r->f) == NULL) {
ok = upb_msgdef_addfield(m, r->f, &r->f, NULL); ok = upb_msgdef_addfield(m, r->f, &r->f, NULL);
UPB_ASSERT(ok); UPB_ASSERT(ok);

@ -28,6 +28,8 @@
* For this reason we don't enable it by default, even in debug builds. * For this reason we don't enable it by default, even in debug builds.
*/ */
/* #define UPB_DEBUG_REFS */
#ifdef __cplusplus #ifdef __cplusplus
namespace upb { namespace upb {
class RefCounted; class RefCounted;

Loading…
Cancel
Save