summaryrefslogtreecommitdiff
path: root/absl/time
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2020-09-22 14:23:22 -0700
committerGravatar vslashg <gfalcon@google.com>2020-09-23 13:36:05 -0400
commit9927a09898f1287e0ecd1276f42ec7a252667dad (patch)
tree29cb426aed67b58a8ffe80cb48e1a3b8a70e1387 /absl/time
parent7680a5f8efe32de4753baadbd63e74e59d95bac1 (diff)
Export of internal Abseil changes
-- bddfb8bae4e569884bf8749f5368e536562f0682 by Samuel Benzaquen <sbenza@google.com>: Forward the Status. PiperOrigin-RevId: 333159251 -- 461640476dab1726eba8d26a0c8012b5a35ba0b1 by Evan Brown <ezb@google.com>: Avoid relying on mutable b-tree set iterators in merge(). Mutable set iterators is an API difference from std::set that we want to get rid of. Also remove a superfluous `public` member specification in btree_container. PiperOrigin-RevId: 333101335 -- 96cf8ac6946840be17da445739c950fd237159f4 by Abseil Team <absl-team@google.com>: Explicitly mention that FormatDuration deviates from Go for the zero duration PiperOrigin-RevId: 333094962 -- 83389040371436aab4e952211e98ffa98e24fd94 by Abseil Team <absl-team@google.com>: Internal change. PiperOrigin-RevId: 332862771 GitOrigin-RevId: bddfb8bae4e569884bf8749f5368e536562f0682 Change-Id: I4a47043ddbad6e700380614c75566c09d4943103
Diffstat (limited to 'absl/time')
-rw-r--r--absl/time/duration.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/absl/time/duration.cc b/absl/time/duration.cc
index 952cc093..eca1a6d9 100644
--- a/absl/time/duration.cc
+++ b/absl/time/duration.cc
@@ -763,7 +763,8 @@ void AppendNumberUnit(std::string* out, double n, DisplayUnit unit) {
// form "72h3m0.5s". Leading zero units are omitted. As a special
// case, durations less than one second format use a smaller unit
// (milli-, micro-, or nanoseconds) to ensure that the leading digit
-// is non-zero. The zero duration formats as 0, with no unit.
+// is non-zero.
+// Unlike Go, we format the zero duration as 0, with no unit.
std::string FormatDuration(Duration d) {
const Duration min_duration = Seconds(kint64min);
if (d == min_duration) {