diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-11-21T13·43+0100 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T14·48+0100 |
| commit | 082c006c04343a78d87b6c6ab3608c25d6213c3f (patch) | |
| tree | 16e6f04f8d1d1d2d67e8e917d5e7bb48c1b60375 /third_party/abseil_cpp/absl/time/time.cc | |
| parent | cc27324d0226953943f408ce3c69ad7d648e005e (diff) | |
merge(3p/absl): subtree merge of Abseil up to e19260f r/1889
... notably, this includes Abseil's own StatusOr type, which conflicted with our implementation (that was taken from TensorFlow). Change-Id: Ie7d6764b64055caaeb8dc7b6b9d066291e6b538f
Diffstat (limited to 'third_party/abseil_cpp/absl/time/time.cc')
| -rw-r--r-- | third_party/abseil_cpp/absl/time/time.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/third_party/abseil_cpp/absl/time/time.cc b/third_party/abseil_cpp/absl/time/time.cc index 6bb36cb3e7ca..1ec2026e254f 100644 --- a/third_party/abseil_cpp/absl/time/time.cc +++ b/third_party/abseil_cpp/absl/time/time.cc @@ -60,9 +60,10 @@ inline cctz::time_point<cctz::seconds> unix_epoch() { inline int64_t FloorToUnit(absl::Duration d, absl::Duration unit) { absl::Duration rem; int64_t q = absl::IDivDuration(d, unit, &rem); - return (q > 0 || - rem >= ZeroDuration() || - q == std::numeric_limits<int64_t>::min()) ? q : q - 1; + return (q > 0 || rem >= ZeroDuration() || + q == std::numeric_limits<int64_t>::min()) + ? q + : q - 1; } inline absl::Time::Breakdown InfiniteFutureBreakdown() { |