diff options
| author | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
| commit | 41113108303afbc1458c1c82b267cc17703ea8ce (patch) | |
| tree | 70ee5f7e6d383fbc5f125daf1b54e1e0766ab1b1 /src/google/protobuf/timestamp.proto | |
| parent | 3bc162a8ace489bc8a62c5e715f7bf673bd8db75 (diff) | |
| parent | 23bb79d4a32a77e8349d6c49052be1e56a8b8153 (diff) | |
| download | protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.tar.gz protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.tar.bz2 protobuf-41113108303afbc1458c1c82b267cc17703ea8ce.zip | |
Merge branch 'master' of github.com:google/protobuf into integrate_from_master
Diffstat (limited to 'src/google/protobuf/timestamp.proto')
| -rw-r--r-- | src/google/protobuf/timestamp.proto | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/google/protobuf/timestamp.proto b/src/google/protobuf/timestamp.proto index 94386de1..381ff997 100644 --- a/src/google/protobuf/timestamp.proto +++ b/src/google/protobuf/timestamp.proto @@ -36,6 +36,8 @@ option java_multiple_files = true; option java_outer_classname = "TimestampProto"; option java_package = "com.google.protobuf"; option csharp_namespace = "Google.ProtocolBuffers"; +option objc_class_prefix = "GPB"; + // A Timestamp represents a point in time independent of any time zone // or calendar, represented as seconds and fractions of seconds at @@ -46,15 +48,16 @@ option csharp_namespace = "Google.ProtocolBuffers"; // 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.) +// 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); // -// Example 2: compute Timestamp from POSIX `gettimeofday()`. +// Example 2: Compute Timestamp from POSIX `gettimeofday()`. // // struct timeval tv; // gettimeofday(&tv, NULL); @@ -63,7 +66,7 @@ option csharp_namespace = "Google.ProtocolBuffers"; // 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); @@ -75,14 +78,14 @@ option csharp_namespace = "Google.ProtocolBuffers"; // 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(); // // Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) // .setNanos((int) ((millis % 1000) * 1000000)).build(); // -// Example 5: compute Timestamp from Python `datetime.datetime`. +// Example 5: Compute Timestamp from Python `datetime.datetime`. // // now = datetime.datetime.utcnow() // seconds = int(time.mktime(now.timetuple())) |