From cfdb9907cb87d15eaab72ceefbfa42fd7a4c3127 Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Sat, 11 May 2013 16:45:38 -0700 Subject: Synced with 3 months of Google-internal development. Major changes: - Got rid of all bytestream interfaces in favor of using regular handlers. - new Pipeline object represents a upb pipeline, does bump allocation internally to manage memory. - proto2 support now can handle extensions. --- upb/google/bridge.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'upb/google/bridge.h') diff --git a/upb/google/bridge.h b/upb/google/bridge.h index 8a2256f..5091e23 100644 --- a/upb/google/bridge.h +++ b/upb/google/bridge.h @@ -66,9 +66,10 @@ namespace google { // // TODO(haberman): Add handler caching functionality so that we don't use // O(n^2) memory in the worst case when incrementally building handlers. -const upb::Handlers* NewWriteHandlers(const proto2::Message& m, void *owner); +const upb::Handlers* NewWriteHandlers(const proto2::Message& m, + const void* owner); const upb::Handlers* NewWriteHandlers(const ::google::protobuf::Message& m, - void *owner); + const void* owner); } // namespace google } // namespace upb -- cgit v1.2.3