Merge from Google-internal development:

- rewritten decoder; interpreted decoder is bytecode-based,
  JIT decoder no longer falls back to the interpreter.
- C++ improvements: C++11-compatible iterators, upb::reffed_ptr
  for RAII refcounting, better upcast/downcast support.
- removed the gross upb_value abstraction from public upb.h.

1 files changed, 2 insertions, 2 deletions

diff --git a/upb/symtab.h b/upb/symtab.h
index 883324a..01d5cd0 100644
--- a/upb/symtab.h
+++ b/upb/symtab.h
@@ -154,9 +154,9 @@ inline SymbolTable* SymbolTable::New(const void* owner) {
   return upb_symtab_new(owner);
 }
 
-inline RefCounted* SymbolTable::Upcast() { return upb_upcast(this); }
+inline RefCounted* SymbolTable::Upcast() { return UPB_UPCAST(this); }
 inline const RefCounted* SymbolTable::Upcast() const {
-  return upb_upcast(this);
+  return UPB_UPCAST(this);
 }
 inline bool SymbolTable::IsFrozen() const {
   return upb_symtab_isfrozen(this);