diff options
| author | Wink Saville <wink@google.com> | 2010-05-29 13:00:38 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2010-05-29 13:00:38 -0700 |
| commit | d0332953cda33fb4f8e24ebff9c49159b69c43d6 (patch) | |
| tree | 81612e8b12f590310aeb0ebf1da37b304eb7baa6 /java/src/main/java/com/google/protobuf/Message.java | |
| parent | ede38fe9b9f93888e6e41afc7abb09525f44da95 (diff) | |
| download | external_protobuf-d0332953cda33fb4f8e24ebff9c49159b69c43d6.zip external_protobuf-d0332953cda33fb4f8e24ebff9c49159b69c43d6.tar.gz external_protobuf-d0332953cda33fb4f8e24ebff9c49159b69c43d6.tar.bz2 | |
Add protobuf 2.3.0 sources
This is the contents of protobuf-2.3.0.tar.bz2 from
http://code.google.com/p/protobuf/downloads/list.
Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2
Diffstat (limited to 'java/src/main/java/com/google/protobuf/Message.java')
| -rw-r--r-- | java/src/main/java/com/google/protobuf/Message.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/main/java/com/google/protobuf/Message.java b/java/src/main/java/com/google/protobuf/Message.java index c11abdc..8c29e21 100644 --- a/java/src/main/java/com/google/protobuf/Message.java +++ b/java/src/main/java/com/google/protobuf/Message.java @@ -296,9 +296,9 @@ public interface Message extends MessageLite { Builder mergeFrom(InputStream input, ExtensionRegistryLite extensionRegistry) throws IOException; - Builder mergeDelimitedFrom(InputStream input) + boolean mergeDelimitedFrom(InputStream input) throws IOException; - Builder mergeDelimitedFrom(InputStream input, + boolean mergeDelimitedFrom(InputStream input, ExtensionRegistryLite extensionRegistry) throws IOException; } |