| Index: third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
|
| diff --git a/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs b/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
|
| index f17358f4b383bb39de23c135c56f143e55142c05..03b19c774c3538413dd40cb62ef4bfbf3a5a0270 100644
|
| --- a/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
|
| +++ b/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
|
| @@ -10,7 +10,6 @@ using scg = global::System.Collections.Generic;
|
| namespace Google.Protobuf.WellKnownTypes {
|
|
|
| /// <summary>Holder for reflection information generated from google/protobuf/duration.proto</summary>
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
| public static partial class DurationReflection {
|
|
|
| #region Descriptor
|
| @@ -26,7 +25,7 @@ namespace Google.Protobuf.WellKnownTypes {
|
| "Ch5nb29nbGUvcHJvdG9idWYvZHVyYXRpb24ucHJvdG8SD2dvb2dsZS5wcm90",
|
| "b2J1ZiIqCghEdXJhdGlvbhIPCgdzZWNvbmRzGAEgASgDEg0KBW5hbm9zGAIg",
|
| "ASgFQnwKE2NvbS5nb29nbGUucHJvdG9idWZCDUR1cmF0aW9uUHJvdG9QAVoq",
|
| - "Z2l0aHViLmNvbS9nb2xhbmcvcHJvdG9idWYvcHR5cGVzL2R1cmF0aW9uoAEB",
|
| + "Z2l0aHViLmNvbS9nb2xhbmcvcHJvdG9idWYvcHR5cGVzL2R1cmF0aW9u+AEB",
|
| "ogIDR1BCqgIeR29vZ2xlLlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZwcm90",
|
| "bzM="));
|
| descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
|
| @@ -40,71 +39,82 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| #region Messages
|
| /// <summary>
|
| - /// A Duration represents a signed, fixed-length span of time represented
|
| - /// as a count of seconds and fractions of seconds at nanosecond
|
| - /// resolution. It is independent of any calendar and concepts like "day"
|
| - /// or "month". It is related to Timestamp in that the difference between
|
| - /// two Timestamp values is a Duration and it can be added or subtracted
|
| - /// from a Timestamp. Range is approximately +-10,000 years.
|
| + /// A Duration represents a signed, fixed-length span of time represented
|
| + /// as a count of seconds and fractions of seconds at nanosecond
|
| + /// resolution. It is independent of any calendar and concepts like "day"
|
| + /// or "month". It is related to Timestamp in that the difference between
|
| + /// two Timestamp values is a Duration and it can be added or subtracted
|
| + /// from a Timestamp. Range is approximately +-10,000 years.
|
| ///
|
| - /// Example 1: Compute Duration from two Timestamps in pseudo code.
|
| + /// Example 1: Compute Duration from two Timestamps in pseudo code.
|
| ///
|
| - /// Timestamp start = ...;
|
| - /// Timestamp end = ...;
|
| - /// Duration duration = ...;
|
| + /// Timestamp start = ...;
|
| + /// Timestamp end = ...;
|
| + /// Duration duration = ...;
|
| ///
|
| - /// duration.seconds = end.seconds - start.seconds;
|
| - /// duration.nanos = end.nanos - start.nanos;
|
| + /// duration.seconds = end.seconds - start.seconds;
|
| + /// duration.nanos = end.nanos - start.nanos;
|
| ///
|
| - /// if (duration.seconds < 0 && duration.nanos > 0) {
|
| - /// duration.seconds += 1;
|
| - /// duration.nanos -= 1000000000;
|
| - /// } else if (durations.seconds > 0 && duration.nanos < 0) {
|
| - /// duration.seconds -= 1;
|
| - /// duration.nanos += 1000000000;
|
| - /// }
|
| + /// if (duration.seconds < 0 && duration.nanos > 0) {
|
| + /// duration.seconds += 1;
|
| + /// duration.nanos -= 1000000000;
|
| + /// } else if (durations.seconds > 0 && duration.nanos < 0) {
|
| + /// duration.seconds -= 1;
|
| + /// duration.nanos += 1000000000;
|
| + /// }
|
| ///
|
| - /// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
|
| + /// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
|
| ///
|
| - /// Timestamp start = ...;
|
| - /// Duration duration = ...;
|
| - /// Timestamp end = ...;
|
| + /// Timestamp start = ...;
|
| + /// Duration duration = ...;
|
| + /// Timestamp end = ...;
|
| ///
|
| - /// end.seconds = start.seconds + duration.seconds;
|
| - /// end.nanos = start.nanos + duration.nanos;
|
| + /// end.seconds = start.seconds + duration.seconds;
|
| + /// end.nanos = start.nanos + duration.nanos;
|
| ///
|
| - /// if (end.nanos < 0) {
|
| - /// end.seconds -= 1;
|
| - /// end.nanos += 1000000000;
|
| - /// } else if (end.nanos >= 1000000000) {
|
| - /// end.seconds += 1;
|
| - /// end.nanos -= 1000000000;
|
| - /// }
|
| + /// if (end.nanos < 0) {
|
| + /// end.seconds -= 1;
|
| + /// end.nanos += 1000000000;
|
| + /// } else if (end.nanos >= 1000000000) {
|
| + /// end.seconds += 1;
|
| + /// end.nanos -= 1000000000;
|
| + /// }
|
| + ///
|
| + /// Example 3: Compute Duration from datetime.timedelta in Python.
|
| + ///
|
| + /// td = datetime.timedelta(days=3, minutes=10)
|
| + /// duration = Duration()
|
| + /// duration.FromTimedelta(td)
|
| /// </summary>
|
| - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
| public sealed partial class Duration : pb::IMessage<Duration> {
|
| private static readonly pb::MessageParser<Duration> _parser = new pb::MessageParser<Duration>(() => new Duration());
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public static pb::MessageParser<Duration> Parser { get { return _parser; } }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public static pbr::MessageDescriptor Descriptor {
|
| get { return global::Google.Protobuf.WellKnownTypes.DurationReflection.Descriptor.MessageTypes[0]; }
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| pbr::MessageDescriptor pb::IMessage.Descriptor {
|
| get { return Descriptor; }
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public Duration() {
|
| OnConstruction();
|
| }
|
|
|
| partial void OnConstruction();
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public Duration(Duration other) : this() {
|
| seconds_ = other.seconds_;
|
| nanos_ = other.nanos_;
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public Duration Clone() {
|
| return new Duration(this);
|
| }
|
| @@ -113,9 +123,10 @@ namespace Google.Protobuf.WellKnownTypes {
|
| public const int SecondsFieldNumber = 1;
|
| private long seconds_;
|
| /// <summary>
|
| - /// Signed seconds of the span of time. Must be from -315,576,000,000
|
| - /// to +315,576,000,000 inclusive.
|
| + /// Signed seconds of the span of time. Must be from -315,576,000,000
|
| + /// to +315,576,000,000 inclusive.
|
| /// </summary>
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public long Seconds {
|
| get { return seconds_; }
|
| set {
|
| @@ -127,13 +138,14 @@ namespace Google.Protobuf.WellKnownTypes {
|
| public const int NanosFieldNumber = 2;
|
| private int nanos_;
|
| /// <summary>
|
| - /// Signed fractions of a second at nanosecond resolution of the span
|
| - /// of time. Durations less than one second are represented with a 0
|
| - /// `seconds` field and a positive or negative `nanos` field. For durations
|
| - /// of one second or more, a non-zero value for the `nanos` field must be
|
| - /// of the same sign as the `seconds` field. Must be from -999,999,999
|
| - /// to +999,999,999 inclusive.
|
| + /// Signed fractions of a second at nanosecond resolution of the span
|
| + /// of time. Durations less than one second are represented with a 0
|
| + /// `seconds` field and a positive or negative `nanos` field. For durations
|
| + /// of one second or more, a non-zero value for the `nanos` field must be
|
| + /// of the same sign as the `seconds` field. Must be from -999,999,999
|
| + /// to +999,999,999 inclusive.
|
| /// </summary>
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public int Nanos {
|
| get { return nanos_; }
|
| set {
|
| @@ -141,10 +153,12 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public override bool Equals(object other) {
|
| return Equals(other as Duration);
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public bool Equals(Duration other) {
|
| if (ReferenceEquals(other, null)) {
|
| return false;
|
| @@ -157,6 +171,7 @@ namespace Google.Protobuf.WellKnownTypes {
|
| return true;
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public override int GetHashCode() {
|
| int hash = 1;
|
| if (Seconds != 0L) hash ^= Seconds.GetHashCode();
|
| @@ -164,10 +179,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);
|
| @@ -179,6 +196,7 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public int CalculateSize() {
|
| int size = 0;
|
| if (Seconds != 0L) {
|
| @@ -190,6 +208,7 @@ namespace Google.Protobuf.WellKnownTypes {
|
| return size;
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public void MergeFrom(Duration other) {
|
| if (other == null) {
|
| return;
|
| @@ -202,6 +221,7 @@ namespace Google.Protobuf.WellKnownTypes {
|
| }
|
| }
|
|
|
| + [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
| public void MergeFrom(pb::CodedInputStream input) {
|
| uint tag;
|
| while ((tag = input.ReadTag()) != 0) {
|
|
|