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

Side by Side Diff: third_party/protobuf/objectivec/GPBWellKnownTypes.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 unified diff | Download patch
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2015 Google Inc. All rights reserved.
3 // http://code.google.com/p/protobuf/ 3 // https://developers.google.com/protocol-buffers/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
11 // * Redistributions in binary form must reproduce the above 11 // * Redistributions in binary form must reproduce the above
12 // copyright notice, this list of conditions and the following disclaimer 12 // copyright notice, this list of conditions and the following disclaimer
13 // in the documentation and/or other materials provided with the 13 // in the documentation and/or other materials provided with the
14 // distribution. 14 // distribution.
15 // * Neither the name of Google Inc. nor the names of its 15 // * Neither the name of Google Inc. nor the names of its
16 // contributors may be used to endorse or promote products derived from 16 // contributors may be used to endorse or promote products derived from
17 // this software without specific prior written permission. 17 // this software without specific prior written permission.
18 // 18 //
19 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 19 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 20 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 21 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 22 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 23 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 24 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 30
31 // Author: robinson@google.com (Will Robinson) 31 #import <Foundation/Foundation.h>
32 32
33 #import "google/protobuf/Duration.pbobjc.h"
34 #import "google/protobuf/Timestamp.pbobjc.h"
33 35
34 package google.protobuf.internal; 36 NS_ASSUME_NONNULL_BEGIN
35 37
36 // A message where tag numbers are listed out of order, to allow us to test our 38 // Extension to GPBTimestamp to work with standard Foundation time/date types.
37 // canonicalization of serialized output, which should always be in tag order. 39 @interface GPBTimestamp (GBPWellKnownTypes)
38 // We also mix in some extensions for extra fun. 40 @property(nonatomic, readwrite, strong) NSDate *date;
39 message OutOfOrderFields { 41 @property(nonatomic, readwrite) NSTimeInterval timeIntervalSince1970;
40 optional sint32 optional_sint32 = 5; 42 - (instancetype)initWithDate:(NSDate *)date;
41 extensions 4 to 4; 43 - (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1 970;
42 optional uint32 optional_uint32 = 3; 44 @end
43 extensions 2 to 2;
44 optional int32 optional_int32 = 1;
45 };
46 45
46 // Extension to GPBDuration to work with standard Foundation time type.
47 @interface GPBDuration (GBPWellKnownTypes)
48 @property(nonatomic, readwrite) NSTimeInterval timeIntervalSince1970;
49 - (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1 970;
50 @end
47 51
48 extend OutOfOrderFields { 52 NS_ASSUME_NONNULL_END
49 optional uint64 optional_uint64 = 4;
50 optional int64 optional_int64 = 2;
51 }
OLDNEW
« no previous file with comments | « third_party/protobuf/objectivec/GPBUtilities_PackagePrivate.h ('k') | third_party/protobuf/objectivec/GPBWellKnownTypes.m » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698