diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-12-07 17:07:05 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-07 17:07:05 -0800 |
commit | 076a82ee7edf35fb5f2a3430535e21a6dbd4cd6d (patch) | |
tree | 87969c375756dc4290478c9ecc5d0d87ae48f557 /upb/bindings/googlepb | |
parent | 9a91f7bba8c89ed4d1cb0d56b8a394a9590df029 (diff) | |
parent | 2b77da3da8234484ebc099c560671ea21ab7181b (diff) |
Merge pull request #74 from haberman/msg
Added upb_msg and Lua bindings for using it.
Diffstat (limited to 'upb/bindings/googlepb')
-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))); } } } |