From cdf20caa491f59c0a35a8d8fbec0d948e4bc7e4c Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 27 Sep 2017 10:50:48 -0700 Subject: Changes imported from Abseil "staging" branch: - 43853019b439efb32c79d5d50e24508588e1bbe0 Undo the not applying qualifications to absl types in enc... by Derek Mauro - 06d62a10621c9864279ee57097069cfe3cb7b42a fix capitalization by Abseil Team - 22adbfee340bb452ba38b68975ade6f072859c4a Fix indices in str_split.h comments. by Derek Mauro - ae5143a559ad8633a78cd76620e30a781006d088 Fix the inconsistent licenses directives in the BUILD fil... by Derek Mauro - 0a76a3653b2ecfdad433d3e2f5b651c4ecdcf74b Remove strip.cc, fastmem.h, and fastmem_test.cc from the ... by Derek Mauro - 77908cfce5927aabca1f8d62481106f22cfc1936 Internal change. by Derek Mauro - d3277b4171f37e22ab346becb5e295c36c7a0219 Be consistent in (not) applying qualifications for enclos... by Abseil Team - 9ec7f8164e7d6a5f64288a7360a346628393cc50 Add std:: qualification to isnan and isinf in duration_te... by Derek Mauro - 9f7c87d7764ddba05286fabca1f4f15285f3250a Fix typos in string_view comments. by Abseil Team - 281860804f8053143d969b99876e3dbc6deb1236 Fix typo in container.h docs. by Abseil Team - 0b0a9388c7a9d7f72349d44b5b46132f45bde56c Add bazel-* symlinks to gitignore. by Michael Pratt GitOrigin-RevId: 43853019b439efb32c79d5d50e24508588e1bbe0 Change-Id: I9e74a5430816a34ecf1acb86486ed3b0bd12a1d6 --- absl/time/time.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'absl/time/time.cc') diff --git a/absl/time/time.cc b/absl/time/time.cc index ee14ba306e80..0fb285a7b2dc 100644 --- a/absl/time/time.cc +++ b/absl/time/time.cc @@ -15,7 +15,7 @@ // The implementation of the absl::Time class, which is declared in // //absl/time.h. // -// The representation for a absl::Time is a absl::Duration offset from the +// The representation for an absl::Time is an absl::Duration offset from the // epoch. We use the traditional Unix epoch (1970-01-01 00:00:00 +0000) // for convenience, but this is not exposed in the API and could be changed. // @@ -23,12 +23,12 @@ // conventions are used throughout this file. // // cz: A cctz::time_zone -// tz: A absl::TimeZone +// tz: An absl::TimeZone // cl: A cctz::time_zone::civil_lookup // al: A cctz::time_zone::absolute_lookup // cd: A cctz::civil_day // cs: A cctz::civil_second -// bd: A absl::Time::Breakdown +// bd: An absl::Time::Breakdown #include "absl/time/time.h" -- cgit 1.4.1