| Index: third_party/protobuf/objectivec/google/protobuf/Timestamp.pbobjc.h
|
| diff --git a/third_party/protobuf/objectivec/google/protobuf/Timestamp.pbobjc.h b/third_party/protobuf/objectivec/google/protobuf/Timestamp.pbobjc.h
|
| index 9c83d0945e496691d99b0f6c6dbf5a19648f3338..925dca840b587ff13798d98de4fb5ee0ffbb2e8a 100644
|
| --- a/third_party/protobuf/objectivec/google/protobuf/Timestamp.pbobjc.h
|
| +++ b/third_party/protobuf/objectivec/google/protobuf/Timestamp.pbobjc.h
|
| @@ -1,23 +1,10 @@
|
| // Generated by the protocol buffer compiler. DO NOT EDIT!
|
| // source: google/protobuf/timestamp.proto
|
|
|
| -// This CPP symbol can be defined to use imports that match up to the framework
|
| -// imports needed when using CocoaPods.
|
| -#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS)
|
| - #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0
|
| -#endif
|
| -
|
| -#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
|
| - #import <Protobuf/GPBProtocolBuffers.h>
|
| -#else
|
| - #import "GPBProtocolBuffers.h"
|
| -#endif
|
| +#import "GPBProtocolBuffers.h"
|
|
|
| -#if GOOGLE_PROTOBUF_OBJC_VERSION < 30002
|
| -#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
|
| -#endif
|
| -#if 30002 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
|
| -#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
|
| +#if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30001
|
| +#error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources.
|
| #endif
|
|
|
| // @@protoc_insertion_point(imports)
|
| @@ -31,16 +18,14 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
| #pragma mark - GPBTimestampRoot
|
|
|
| -/**
|
| - * Exposes the extension registry for this file.
|
| - *
|
| - * The base class provides:
|
| - * @code
|
| - * + (GPBExtensionRegistry *)extensionRegistry;
|
| - * @endcode
|
| - * which is a @c GPBExtensionRegistry that includes all the extensions defined by
|
| - * this file and all files that it depends on.
|
| - **/
|
| +/// Exposes the extension registry for this file.
|
| +///
|
| +/// The base class provides:
|
| +/// @code
|
| +/// + (GPBExtensionRegistry *)extensionRegistry;
|
| +/// @endcode
|
| +/// which is a @c GPBExtensionRegistry that includes all the extensions defined by
|
| +/// this file and all files that it depends on.
|
| @interface GPBTimestampRoot : GPBRootObject
|
| @end
|
|
|
| @@ -51,74 +36,70 @@ typedef GPB_ENUM(GPBTimestamp_FieldNumber) {
|
| GPBTimestamp_FieldNumber_Nanos = 2,
|
| };
|
|
|
| -/**
|
| - * A Timestamp represents a point in time independent of any time zone
|
| - * or calendar, represented as seconds and fractions of seconds at
|
| - * nanosecond resolution in UTC Epoch time. It is encoded using the
|
| - * Proleptic Gregorian Calendar which extends the Gregorian calendar
|
| - * backwards to year one. It is encoded assuming all minutes are 60
|
| - * seconds long, i.e. leap seconds are "smeared" so that no leap second
|
| - * table is needed for interpretation. Range is from
|
| - * 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z.
|
| - * By restricting to that range, we ensure that we can convert to
|
| - * and from RFC 3339 date strings.
|
| - * See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt).
|
| - *
|
| - * Example 1: Compute Timestamp from POSIX `time()`.
|
| - *
|
| - * Timestamp timestamp;
|
| - * timestamp.set_seconds(time(NULL));
|
| - * timestamp.set_nanos(0);
|
| - *
|
| - * Example 2: Compute Timestamp from POSIX `gettimeofday()`.
|
| - *
|
| - * struct timeval tv;
|
| - * gettimeofday(&tv, NULL);
|
| - *
|
| - * Timestamp timestamp;
|
| - * timestamp.set_seconds(tv.tv_sec);
|
| - * timestamp.set_nanos(tv.tv_usec * 1000);
|
| - *
|
| - * Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
|
| - *
|
| - * FILETIME ft;
|
| - * GetSystemTimeAsFileTime(&ft);
|
| - * UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
|
| - *
|
| - * // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
|
| - * // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
|
| - * Timestamp timestamp;
|
| - * timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
|
| - * timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
|
| - *
|
| - * Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
|
| - *
|
| - * long millis = System.currentTimeMillis();
|
| - *
|
| - * Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
|
| - * .setNanos((int) ((millis % 1000) * 1000000)).build();
|
| - *
|
| - *
|
| - * Example 5: Compute Timestamp from current time in Python.
|
| - *
|
| - * timestamp = Timestamp()
|
| - * timestamp.GetCurrentTime()
|
| - **/
|
| +/// A Timestamp represents a point in time independent of any time zone
|
| +/// or calendar, represented as seconds and fractions of seconds at
|
| +/// nanosecond resolution in UTC Epoch time. It is encoded using the
|
| +/// Proleptic Gregorian Calendar which extends the Gregorian calendar
|
| +/// backwards to year one. It is encoded assuming all minutes are 60
|
| +/// seconds long, i.e. leap seconds are "smeared" so that no leap second
|
| +/// table is needed for interpretation. Range is from
|
| +/// 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z.
|
| +/// By restricting to that range, we ensure that we can convert to
|
| +/// and from RFC 3339 date strings.
|
| +/// See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt).
|
| +///
|
| +/// Example 1: Compute Timestamp from POSIX `time()`.
|
| +///
|
| +/// Timestamp timestamp;
|
| +/// timestamp.set_seconds(time(NULL));
|
| +/// timestamp.set_nanos(0);
|
| +///
|
| +/// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
|
| +///
|
| +/// struct timeval tv;
|
| +/// gettimeofday(&tv, NULL);
|
| +///
|
| +/// Timestamp timestamp;
|
| +/// timestamp.set_seconds(tv.tv_sec);
|
| +/// timestamp.set_nanos(tv.tv_usec * 1000);
|
| +///
|
| +/// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
|
| +///
|
| +/// FILETIME ft;
|
| +/// GetSystemTimeAsFileTime(&ft);
|
| +/// UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
|
| +///
|
| +/// // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
|
| +/// // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
|
| +/// Timestamp timestamp;
|
| +/// timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
|
| +/// timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
|
| +///
|
| +/// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
|
| +///
|
| +/// long millis = System.currentTimeMillis();
|
| +///
|
| +/// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
|
| +/// .setNanos((int) ((millis % 1000) * 1000000)).build();
|
| +///
|
| +///
|
| +/// Example 5: Compute Timestamp from current time in Python.
|
| +///
|
| +/// now = time.time()
|
| +/// seconds = int(now)
|
| +/// nanos = int((now - seconds) * 10**9)
|
| +/// timestamp = Timestamp(seconds=seconds, nanos=nanos)
|
| @interface GPBTimestamp : GPBMessage
|
|
|
| -/**
|
| - * Represents seconds of UTC time since Unix epoch
|
| - * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
|
| - * 9999-12-31T23:59:59Z inclusive.
|
| - **/
|
| +/// Represents seconds of UTC time since Unix epoch
|
| +/// 1970-01-01T00:00:00Z. Must be from from 0001-01-01T00:00:00Z to
|
| +/// 9999-12-31T23:59:59Z inclusive.
|
| @property(nonatomic, readwrite) int64_t seconds;
|
|
|
| -/**
|
| - * Non-negative fractions of a second at nanosecond resolution. Negative
|
| - * second values with fractions must still have non-negative nanos values
|
| - * that count forward in time. Must be from 0 to 999,999,999
|
| - * inclusive.
|
| - **/
|
| +/// Non-negative fractions of a second at nanosecond resolution. Negative
|
| +/// second values with fractions must still have non-negative nanos values
|
| +/// that count forward in time. Must be from 0 to 999,999,999
|
| +/// inclusive.
|
| @property(nonatomic, readwrite) int32_t nanos;
|
|
|
| @end
|
|
|