From e977c0af03fa2aa366ca7ecffcf007f186357c60 Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Tue, 29 Nov 2016 19:54:12 +0000
Subject: Fixed more bugs surfaced by Travis.

---
 upb/bindings/googlepb/proto2.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'upb/bindings/googlepb/proto2.cc')

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)));
       }
     }
   }
-- 
cgit v1.2.3