diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2023-05-08 12:51:08 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2023-05-08 12:51:08 -0400 |
| commit | c15cec707b1c7d847e59d2db4d0b82b711a7ee6d (patch) | |
| tree | 79f448d5bbc8cf52917b0b091f0e1ab60a419c85 /absl/time/format.cc | |
| parent | f4f2c1da90c4e6a0683c4e66c0268baa1b79cdf3 (diff) | |
| parent | c2435f8342c2d0ed8101cb43adfd605fdc52dca2 (diff) | |
| download | abseil-c15cec707b1c7d847e59d2db4d0b82b711a7ee6d.tar.gz abseil-c15cec707b1c7d847e59d2db4d0b82b711a7ee6d.tar.bz2 abseil-c15cec707b1c7d847e59d2db4d0b82b711a7ee6d.zip | |
Merge new upstream LTS 20230125.3
Diffstat (limited to 'absl/time/format.cc')
| -rw-r--r-- | absl/time/format.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/absl/time/format.cc b/absl/time/format.cc index 4005fb70..15a26b14 100644 --- a/absl/time/format.cc +++ b/absl/time/format.cc @@ -64,7 +64,8 @@ cctz_parts Split(absl::Time t) { // details about rep_hi and rep_lo. absl::Time Join(const cctz_parts& parts) { const int64_t rep_hi = (parts.sec - unix_epoch()).count(); - const uint32_t rep_lo = parts.fem.count() / (1000 * 1000 / 4); + const uint32_t rep_lo = + static_cast<uint32_t>(parts.fem.count() / (1000 * 1000 / 4)); const auto d = time_internal::MakeDuration(rep_hi, rep_lo); return time_internal::FromUnixDuration(d); } |