diff options
| author | Feng Xiao <xiaofeng@google.com> | 2015-08-28 10:28:44 -0700 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2015-08-28 10:28:44 -0700 |
| commit | fb0af6d02eab821891fb245ea5a4fe9f1f2ac01d (patch) | |
| tree | 660070809c57c3016f32586959a1b7bfb4867403 | |
| parent | 47210ccd77c88becb9097d59b7765c2d2b41d68e (diff) | |
| parent | d6801595277a194745ec65797e0c8447247066f9 (diff) | |
| download | protobuf-fb0af6d02eab821891fb245ea5a4fe9f1f2ac01d.tar.gz protobuf-fb0af6d02eab821891fb245ea5a4fe9f1f2ac01d.tar.bz2 protobuf-fb0af6d02eab821891fb245ea5a4fe9f1f2ac01d.zip | |
Merge pull request #768 from pkasting/time
Delete kNanosPerSecond from time.cc.
| -rw-r--r-- | src/google/protobuf/stubs/time.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/time.cc b/src/google/protobuf/stubs/time.cc index 3319a244..49c0412c 100644 --- a/src/google/protobuf/stubs/time.cc +++ b/src/google/protobuf/stubs/time.cc @@ -21,7 +21,6 @@ static const int64 kSecondsFromEraToEpoch = 62135596800LL; static const int64 kMinTime = -62135596800LL; // 0001-01-01T00:00:00 static const int64 kMaxTime = 253402300799LL; // 9999-12-31T23:59:59 -static const int kNanosPerSecond = 1000000000; static const int kNanosPerMillisecond = 1000000; static const int kNanosPerMicrosecond = 1000; |