| Index: third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
|
| diff --git a/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs b/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
|
| index 053b88bd33c9e639a12da4a13a361f1975292906..b789f6da7b96226a0fd9eb71ba7f6cd1e3d9818a 100644
|
| --- a/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
|
| +++ b/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
|
| @@ -10,7 +10,6 @@ using scg = global::System.Collections.Generic;
|
| namespace Google.Protobuf.WellKnownTypes {
|
|
|
| /// <summary>Holder for reflection information generated from google/protobuf/timestamp.proto</summary>
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
| public static partial class TimestampReflection {
|
|
|
| #region Descriptor
|
| @@ -25,10 +24,10 @@ namespace Google.Protobuf.WellKnownTypes {
|
| string.Concat(
|
| "Ch9nb29nbGUvcHJvdG9idWYvdGltZXN0YW1wLnByb3RvEg9nb29nbGUucHJv",
|
| "dG9idWYiKwoJVGltZXN0YW1wEg8KB3NlY29uZHMYASABKAMSDQoFbmFub3MY",
|
| - "AiABKAVCgQEKE2NvbS5nb29nbGUucHJvdG9idWZCDlRpbWVzdGFtcFByb3Rv",
|
| - "UAFaK2dpdGh1Yi5jb20vZ29sYW5nL3Byb3RvYnVmL3B0eXBlcy90aW1lc3Rh",
|
| - "bXCgAQH4AQGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlw",
|
| - "ZXNiBnByb3RvMw=="));
|
| + "AiABKAVCfgoTY29tLmdvb2dsZS5wcm90b2J1ZkIOVGltZXN0YW1wUHJvdG9Q",
|
| + "AVorZ2l0aHViLmNvbS9nb2xhbmcvcHJvdG9idWYvcHR5cGVzL3RpbWVzdGFt",
|
| + "cPgBAaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IG",
|
| + "cHJvdG8z"));
|
| descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
|
| new pbr::FileDescriptor[] { },
|
| new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
|
| @@ -40,83 +39,86 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| #region Messages
|
| /// <summary>
|
| - /// 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).
|
| + /// 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()`.
|
| + /// Example 1: Compute Timestamp from POSIX `time()`.
|
| ///
|
| - /// Timestamp timestamp;
|
| - /// timestamp.set_seconds(time(NULL));
|
| - /// timestamp.set_nanos(0);
|
| + /// Timestamp timestamp;
|
| + /// timestamp.set_seconds(time(NULL));
|
| + /// timestamp.set_nanos(0);
|
| ///
|
| - /// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
|
| + /// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
|
| ///
|
| - /// struct timeval tv;
|
| - /// gettimeofday(&tv, NULL);
|
| + /// struct timeval tv;
|
| + /// gettimeofday(&tv, NULL);
|
| ///
|
| - /// Timestamp timestamp;
|
| - /// timestamp.set_seconds(tv.tv_sec);
|
| - /// timestamp.set_nanos(tv.tv_usec * 1000);
|
| + /// Timestamp timestamp;
|
| + /// timestamp.set_seconds(tv.tv_sec);
|
| + /// timestamp.set_nanos(tv.tv_usec * 1000);
|
| ///
|
| - /// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
|
| + /// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
|
| ///
|
| - /// FILETIME ft;
|
| - /// GetSystemTimeAsFileTime(&ft);
|
| - /// UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
|
| + /// 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));
|
| + /// // 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()`.
|
| + /// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
|
| ///
|
| - /// long millis = System.currentTimeMillis();
|
| + /// long millis = System.currentTimeMillis();
|
| ///
|
| - /// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
|
| - /// .setNanos((int) ((millis % 1000) * 1000000)).build();
|
| + /// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
|
| + /// .setNanos((int) ((millis % 1000) * 1000000)).build();
|
| ///
|
| - /// Example 5: Compute Timestamp from current time in Python.
|
| + /// 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)
|
| + /// timestamp = Timestamp()
|
| + /// timestamp.GetCurrentTime()
|
| /// </summary>
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
| public sealed partial class Timestamp : pb::IMessage<Timestamp> {
|
| private static readonly pb::MessageParser<Timestamp> _parser = new pb::MessageParser<Timestamp>(() => new Timestamp());
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public static pb::MessageParser<Timestamp> Parser { get { return _parser; } }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public static pbr::MessageDescriptor Descriptor {
|
| get { return global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor.MessageTypes[0]; }
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| pbr::MessageDescriptor pb::IMessage.Descriptor {
|
| get { return Descriptor; }
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public Timestamp() {
|
| OnConstruction();
|
| }
|
|
|
| partial void OnConstruction();
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public Timestamp(Timestamp other) : this() {
|
| seconds_ = other.seconds_;
|
| nanos_ = other.nanos_;
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public Timestamp Clone() {
|
| return new Timestamp(this);
|
| }
|
| @@ -125,10 +127,11 @@ namespace Google.Protobuf.WellKnownTypes {
|
| public const int SecondsFieldNumber = 1;
|
| private long seconds_;
|
| /// <summary>
|
| - /// 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.
|
| + /// 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.
|
| /// </summary>
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public long Seconds {
|
| get { return seconds_; }
|
| set {
|
| @@ -140,11 +143,12 @@ namespace Google.Protobuf.WellKnownTypes {
|
| public const int NanosFieldNumber = 2;
|
| private int nanos_;
|
| /// <summary>
|
| - /// 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.
|
| /// </summary>
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public int Nanos {
|
| get { return nanos_; }
|
| set {
|
| @@ -152,10 +156,12 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public override bool Equals(object other) {
|
| return Equals(other as Timestamp);
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public bool Equals(Timestamp other) {
|
| if (ReferenceEquals(other, null)) {
|
| return false;
|
| @@ -168,6 +174,7 @@ namespace Google.Protobuf.WellKnownTypes {
|
| return true;
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public override int GetHashCode() {
|
| int hash = 1;
|
| if (Seconds != 0L) hash ^= Seconds.GetHashCode();
|
| @@ -175,10 +182,12 @@ namespace Google.Protobuf.WellKnownTypes {
|
| return hash;
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public override string ToString() {
|
| return pb::JsonFormatter.ToDiagnosticString(this);
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public void WriteTo(pb::CodedOutputStream output) {
|
| if (Seconds != 0L) {
|
| output.WriteRawTag(8);
|
| @@ -190,6 +199,7 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public int CalculateSize() {
|
| int size = 0;
|
| if (Seconds != 0L) {
|
| @@ -201,6 +211,7 @@ namespace Google.Protobuf.WellKnownTypes {
|
| return size;
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public void MergeFrom(Timestamp other) {
|
| if (other == null) {
|
| return;
|
| @@ -213,6 +224,7 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public void MergeFrom(pb::CodedInputStream input) {
|
| uint tag;
|
| while ((tag = input.ReadTag()) != 0) {
|
|
|