From cc8ca5b6a5478b40546d4206392eb1471454460d Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Mon, 19 Sep 2016 13:45:07 -0700 Subject: Integrate internal changes --- objectivec/google/protobuf/Duration.pbobjc.h | 6 ++++++ objectivec/google/protobuf/FieldMask.pbobjc.h | 6 +++--- objectivec/google/protobuf/Timestamp.pbobjc.h | 8 +++----- 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'objectivec/google') diff --git a/objectivec/google/protobuf/Duration.pbobjc.h b/objectivec/google/protobuf/Duration.pbobjc.h index 67380704..e70138a0 100644 --- a/objectivec/google/protobuf/Duration.pbobjc.h +++ b/objectivec/google/protobuf/Duration.pbobjc.h @@ -92,6 +92,12 @@ typedef GPB_ENUM(GPBDuration_FieldNumber) { * 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) **/ @interface GPBDuration : GPBMessage diff --git a/objectivec/google/protobuf/FieldMask.pbobjc.h b/objectivec/google/protobuf/FieldMask.pbobjc.h index 6434ac18..07e60818 100644 --- a/objectivec/google/protobuf/FieldMask.pbobjc.h +++ b/objectivec/google/protobuf/FieldMask.pbobjc.h @@ -94,7 +94,7 @@ typedef GPB_ENUM(GPBFieldMask_FieldNumber) { * } * * A repeated field is not allowed except at the last position of a - * field mask. + * paths string. * * If a FieldMask object is not present in a get operation, the * operation applies to all fields (as if a FieldMask of all fields @@ -121,8 +121,8 @@ typedef GPB_ENUM(GPBFieldMask_FieldNumber) { * * If a repeated field is specified for an update operation, the existing * repeated values in the target resource will be overwritten by the new values. - * Note that a repeated field is only allowed in the last position of a field - * mask. + * Note that a repeated field is only allowed in the last position of a `paths` + * string. * * If a sub-message is specified in the last position of the field mask for an * update operation, then the existing sub-message in the target resource is diff --git a/objectivec/google/protobuf/Timestamp.pbobjc.h b/objectivec/google/protobuf/Timestamp.pbobjc.h index 898f88e3..9c83d094 100644 --- a/objectivec/google/protobuf/Timestamp.pbobjc.h +++ b/objectivec/google/protobuf/Timestamp.pbobjc.h @@ -101,16 +101,14 @@ typedef GPB_ENUM(GPBTimestamp_FieldNumber) { * * 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() **/ @interface GPBTimestamp : GPBMessage /** * Represents seconds of UTC time since Unix epoch - * 1970-01-01T00:00:00Z. Must be from from 0001-01-01T00:00:00Z to + * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to * 9999-12-31T23:59:59Z inclusive. **/ @property(nonatomic, readwrite) int64_t seconds; -- cgit v1.2.3