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.

1 files changed, 3 insertions, 5 deletions

diff --git a/upb/google/proto1.h b/upb/google/proto1.h
index f35fb13..eb550ac 100644
--- a/upb/google/proto1.h
+++ b/upb/google/proto1.h
@@ -38,14 +38,12 @@ bool TrySetProto1WriteHandlers(const proto2::FieldDescriptor* proto2_f,
 // Returns a prototype for the given field in "m", if it is weak.  The returned
 // message could be the linked-in message type or OpaqueMessage, if the weak
 // message is *not* linked in.  Otherwise returns NULL.
-const proto2::Message* GetProto1WeakPrototype(
-    const proto2::Message& m,
-    const proto2::FieldDescriptor* f);
+const proto2::Message* GetProto1WeakPrototype(const proto2::Message& m,
+                                              const proto2::FieldDescriptor* f);
 
 // Returns a prototype for the given non-weak field in "m".
 const proto2::Message* GetProto1FieldPrototype(
-    const proto2::Message& m,
-    const proto2::FieldDescriptor* f);
+    const proto2::Message& m, const proto2::FieldDescriptor* f);
 
 }  // namespace google
 }  // namespace upb