Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: third_party/protobuf/objectivec/GPBUnknownField_PackagePrivate.h

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/objectivec/GPBUnknownField_PackagePrivate.h
diff --git a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc b/third_party/protobuf/objectivec/GPBUnknownField_PackagePrivate.h
similarity index 77%
copy from third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
copy to third_party/protobuf/objectivec/GPBUnknownField_PackagePrivate.h
index dad6ff14468d031f16baafb2f1ca567961251c43..1fbce0f9549dc219c0f134fc1ab4d662bcab8f73 100644
--- a/third_party/protobuf/src/google/protobuf/io/zero_copy_stream.cc
+++ b/third_party/protobuf/objectivec/GPBUnknownField_PackagePrivate.h
@@ -1,6 +1,6 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
-// http://code.google.com/p/protobuf/
+// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
@@ -28,21 +28,22 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Author: kenton@google.com (Kenton Varda)
-// Based on original Protocol Buffers design by
-// Sanjay Ghemawat, Jeff Dean, and others.
+#import <Foundation/Foundation.h>
-#include <google/protobuf/io/zero_copy_stream.h>
+#import "GPBUnknownField.h"
+@class GPBCodedOutputStream;
-namespace google {
-namespace protobuf {
-namespace io {
+@interface GPBUnknownField ()
-ZeroCopyInputStream::~ZeroCopyInputStream() {}
-ZeroCopyOutputStream::~ZeroCopyOutputStream() {}
+- (instancetype)initWithNumber:(int32_t)number;
+- (void)writeToOutput:(GPBCodedOutputStream *)output;
+- (size_t)serializedSize;
-} // namespace io
-} // namespace protobuf
-} // namespace google
+- (void)writeAsMessageSetExtensionToOutput:(GPBCodedOutputStream *)output;
+- (size_t)serializedSizeAsMessageSetExtension;
+
+- (void)mergeFromField:(GPBUnknownField *)other;
+
+@end
« no previous file with comments | « third_party/protobuf/objectivec/GPBUnknownFieldSet_PackagePrivate.h ('k') | third_party/protobuf/objectivec/GPBUtilities.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698