diff options
author | Josh Haberman <haberman@google.com> | 2013-05-11 16:45:38 -0700 |
---|---|---|
committer | Josh Haberman <haberman@google.com> | 2013-05-11 16:45:38 -0700 |
commit | cfdb9907cb87d15eaab72ceefbfa42fd7a4c3127 (patch) | |
tree | 63f5d70ad64daeeb4ffc777c2c3afd50e2e281b1 /upb/google/proto2.h | |
parent | 7d3e2bd2c4cfd1296d1d6f996d7548de26540d41 (diff) |
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.
Diffstat (limited to 'upb/google/proto2.h')
-rw-r--r-- | upb/google/proto2.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/upb/google/proto2.h b/upb/google/proto2.h index f2662ea..516b7fd 100644 --- a/upb/google/proto2.h +++ b/upb/google/proto2.h @@ -49,9 +49,8 @@ bool TrySetWriteHandlers(const ::google::protobuf::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* GetFieldPrototype( - const proto2::Message& m, - const proto2::FieldDescriptor* f); +const proto2::Message* GetFieldPrototype(const proto2::Message& m, + const proto2::FieldDescriptor* f); const ::google::protobuf::Message* GetFieldPrototype( const ::google::protobuf::Message& m, const ::google::protobuf::FieldDescriptor* f); |