2 files changed, 5 insertions, 42 deletions
diff --git a/bindings/cpp/upb/pb/decoder.hpp b/bindings/cpp/upb/pb/decoder.hpp
index 05bcb8a..950e9e2 100644
--- a/bindings/cpp/upb/pb/decoder.hpp
+++ b/bindings/cpp/upb/pb/decoder.hpp
@@ -22,14 +22,14 @@
 
 #include "upb/pb/decoder.h"
 
-#include "upb/bytestream.hpp"
-#include "upb/upb.hpp"
+#include "upb/bytestream.h"
+#include "upb/upb.h"
 
 namespace upb {
 
 class DecoderPlan : public upb_decoderplan {
  public:
-  static DecoderPlan* New(Handlers* h, bool allow_jit) {
+  static DecoderPlan* New(const Handlers* h, bool allow_jit) {
     return static_cast<DecoderPlan*>(upb_decoderplan_new(h, allow_jit));
   }
   void Unref() { upb_decoderplan_unref(this); }
@@ -54,9 +54,7 @@ class Decoder : public upb_decoder {
   // reset to a different plan.
   //
   // Must be called before ResetInput() or Decode().
-  void ResetPlan(DecoderPlan* plan, int32_t msg_offset) {
-    upb_decoder_resetplan(this, plan, msg_offset);
-  }
+  void ResetPlan(DecoderPlan* plan) { upb_decoder_resetplan(this, plan); }
 
   // Resets the input of the decoder.  This puts it in a state where it has not
   // seen any data, and expects the next data to be from the beginning of a new
@@ -71,7 +69,7 @@ class Decoder : public upb_decoder {
 
   // Decodes serialized data (calling Handlers as the data is parsed) until
   // error or EOF (see status() for details).
-  Success Decode() { return upb_decoder_decode(this); }
+  Status::Success Decode() { return upb_decoder_decode(this); }
 
   const upb::Status& status() {
     return static_cast<const upb::Status&>(*upb_decoder_status(this));
diff --git a/bindings/cpp/upb/pb/glue.hpp b/bindings/cpp/upb/pb/glue.hpp
deleted file mode 100644
index d43baeb..0000000
--- a/bindings/cpp/upb/pb/glue.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * upb - a minimalist implementation of protocol buffers.
- *
- * Copyright (c) 2011 Google Inc.  See LICENSE for details.
- * Author: Josh Haberman <jhaberman@gmail.com>
- */
-
-#ifndef UPB_PB_GLUE_HPP
-#define UPB_PB_GLUE_HPP
-
-#include "upb/upb.hpp"
-#include "upb/pb/glue.h"
-
-namespace upb {
-
-// All routines that load descriptors expect the descriptor to be a
-// FileDescriptorSet.
-bool LoadDescriptorFileIntoSymtab(SymbolTable* s, const char *fname,
-                                  Status* status) {
-  return upb_load_descriptor_file_into_symtab(s, fname, status);
-}
-
-bool LoadDescriptorIntoSymtab(SymbolTable* s, const char* str,
-                              size_t len, Status* status) {
-  return upb_load_descriptor_into_symtab(s, str, len, status);
-}
-
-template <typename T>
-bool LoadDescriptorIntoSymtab(SymbolTable* s, const T& desc, Status* status) {
-  return upb_load_descriptor_into_symtab(s, desc.c_str(), desc.size(), status);
-}
-
-}  // namespace upb
-
-#endif