From 90bb4246c34580eb6c8a5a41a4e19fcd5f334f09 Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Sat, 25 May 2013 10:26:59 -0700 Subject: Synced with Google-internal development. C++ handlers are now type-safe; SinkFrame is gone. Various other changes. --- upb/pb/glue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'upb/pb/glue.c') diff --git a/upb/pb/glue.c b/upb/pb/glue.c index bcde039..2c621f4 100644 --- a/upb/pb/glue.c +++ b/upb/pb/glue.c @@ -30,7 +30,7 @@ upb_def **upb_load_defs_from_descriptor(const char *str, size_t len, int *n, // Create sinks. upb_sink *reader_sink = upb_pipeline_newsink(&pipeline, reader_h); upb_sink *decoder_sink = upb_pipeline_newsink(&pipeline, decoder_h); - upb_pbdecoder *d = upb_sinkframe_userdata(upb_sink_base(decoder_sink)); + upb_pbdecoder *d = upb_sink_getobj(decoder_sink); upb_pbdecoder_resetsink(d, reader_sink); // Push input data. @@ -42,7 +42,7 @@ upb_def **upb_load_defs_from_descriptor(const char *str, size_t len, int *n, return NULL; } - upb_descreader *r = upb_sinkframe_userdata(upb_sink_base(reader_sink)); + upb_descreader *r = upb_sink_getobj(reader_sink); upb_def **defs = upb_descreader_getdefs(r, owner, n); upb_def **defscopy = malloc(sizeof(upb_def*) * (*n)); memcpy(defscopy, defs, sizeof(upb_def*) * (*n)); -- cgit v1.2.3