diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-11-29 19:54:12 +0000 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-11-29 19:54:12 +0000 |
| commit | e977c0af03fa2aa366ca7ecffcf007f186357c60 (patch) | |
| tree | cebb16f6b8b9686d7da1a892465c9b74e53674d2 /upb/bindings | |
| parent | 39c2414d686e92541cda94904e003d4f0d15ca08 (diff) | |
Fixed more bugs surfaced by Travis.
Diffstat (limited to 'upb/bindings')
| -rw-r--r-- | upb/bindings/googlepb/proto2.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/upb/bindings/googlepb/proto2.cc b/upb/bindings/googlepb/proto2.cc index bfd5ba2..ebfedca 100644 --- a/upb/bindings/googlepb/proto2.cc +++ b/upb/bindings/googlepb/proto2.cc @@ -12,10 +12,10 @@ #include <map> -#include "upb/def.h" #include "upb/bindings/googlepb/proto1.int.h" +#include "upb/def.h" #include "upb/handlers.h" -#include "upb/shim/shim.h" +#include "upb/msg.h" #include "upb/sink.h" namespace { @@ -593,8 +593,8 @@ case goog::FieldDescriptor::cpptype: \ SetStartRepeatedField<T>(proto2_f, r, f, h); CHKRET(h->SetValueHandler<T>(f, UpbMakeHandlerT(AppendPrimitive<T>))); } else { - CHKRET(upb::Shim::Set(h, f, GetOffset(proto2_f, r), - GetHasbit(proto2_f, r))); + CHKRET(upb_msg_setscalarhandler(h, f, GetOffset(proto2_f, r), + GetHasbit(proto2_f, r))); } } } |