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

Unified Diff: third_party/protobuf/objectivec/GPBUnknownField.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.h
diff --git a/third_party/protobuf/src/google/protobuf/unittest_import.proto b/third_party/protobuf/objectivec/GPBUnknownField.h
similarity index 62%
copy from third_party/protobuf/src/google/protobuf/unittest_import.proto
copy to third_party/protobuf/objectivec/GPBUnknownField.h
index c115b11171afaa03d7ee6aeedc7506689cfd7038..12d72a9acd5cc0b2de0b9d99c430c5363a872a5b 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_import.proto
+++ b/third_party/protobuf/objectivec/GPBUnknownField.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,37 +28,33 @@
// (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.
-//
-// A proto file which is imported by unittest.proto to test importing.
-
+#import <Foundation/Foundation.h>
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do
-// "using namespace unittest_import = protobuf_unittest_import".
-package protobuf_unittest_import;
+@class GPBCodedOutputStream;
+@class GPBUInt32Array;
+@class GPBUInt64Array;
+@class GPBUnknownFieldSet;
-option optimize_for = SPEED;
+NS_ASSUME_NONNULL_BEGIN
-// Excercise the java_package option.
-option java_package = "com.google.protobuf.test";
+@interface GPBUnknownField : NSObject<NSCopying>
-// Do not set a java_outer_classname here to verify that Proto2 works without
-// one.
+@property(nonatomic, readonly, assign) int32_t number;
-// Test public import
-import public "google/protobuf/unittest_import_public.proto";
+// Only one of these will be set.
+@property(nonatomic, readonly, strong) GPBUInt64Array *varintList;
+@property(nonatomic, readonly, strong) GPBUInt32Array *fixed32List;
+@property(nonatomic, readonly, strong) GPBUInt64Array *fixed64List;
+@property(nonatomic, readonly, strong) NSArray *lengthDelimitedList; // NSData
+@property(nonatomic, readonly, strong) NSArray *groupList; // GPBUnknownFieldSet
-message ImportMessage {
- optional int32 d = 1;
-}
+// Only one of these should be used per Field.
+- (void)addVarint:(uint64_t)value;
+- (void)addFixed32:(uint32_t)value;
+- (void)addFixed64:(uint64_t)value;
+- (void)addLengthDelimited:(NSData *)value;
+- (void)addGroup:(GPBUnknownFieldSet *)value;
-enum ImportEnum {
- IMPORT_FOO = 7;
- IMPORT_BAR = 8;
- IMPORT_BAZ = 9;
-}
+@end
+NS_ASSUME_NONNULL_END
« no previous file with comments | « third_party/protobuf/objectivec/GPBRuntimeTypes.h ('k') | third_party/protobuf/objectivec/GPBUnknownField.m » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698