From cc4bed2d74f7c8717e31f9579214ab52a9c9c610 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 3 Oct 2017 22:13:32 -0700 Subject: Changes imported from Abseil "staging" branch: - cdcf33b6176a51b6b9bcdf1032b4aa407a9a6990 Clarify that "0" without a suffix parses to ZeroDuration(... by Abseil Team - 65c8997d5a3a4cff63f1dc8a72dcee89c456a17b spelling 'available' by Abseil Team - 1a2b51427c38d471a3f2b8806f015d1598877559 Clean up a comment by Abseil Team - ea1ae153fff759a60fbf946f2865f14253e21289 Fix typo in string_view comments. by Abseil Team - 94d7e6d9e9e379e352aa3cc5e37ac4ffd81db234 Replace x64_windows_msvc with x64_windows (bazel default)... by Xiaoyi Zhang GitOrigin-RevId: cdcf33b6176a51b6b9bcdf1032b4aa407a9a6990 Change-Id: I3ccdcf1b8c5c08997e68cb1f336b02f003a3a72d --- absl/BUILD.bazel | 2 +- absl/base/config.h | 2 +- absl/strings/string_view.h | 4 ++-- absl/time/time.h | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'absl') diff --git a/absl/BUILD.bazel b/absl/BUILD.bazel index 92e9059b..403a35c3 100644 --- a/absl/BUILD.bazel +++ b/absl/BUILD.bazel @@ -36,7 +36,7 @@ config_setting( config_setting( name = "windows", values = { - "cpu": "x64_windows_msvc", + "cpu": "x64_windows", }, ) diff --git a/absl/base/config.h b/absl/base/config.h index 875d8e4f..4aff4923 100644 --- a/absl/base/config.h +++ b/absl/base/config.h @@ -335,7 +335,7 @@ // ABSL_HAVE_STD_ANY // -// Checks whether C++17 std::any is availble by checking whether exists. +// Checks whether C++17 std::any is available by checking whether exists. #ifdef ABSL_HAVE_STD_ANY #error "ABSL_HAVE_STD_ANY cannot be directly set." #endif diff --git a/absl/strings/string_view.h b/absl/strings/string_view.h index 033509ad..951e9cbc 100644 --- a/absl/strings/string_view.h +++ b/absl/strings/string_view.h @@ -176,7 +176,7 @@ class string_view { constexpr string_view(const char* str) // NOLINT(runtime/explicit) : ptr_(str), length_(StrLenInternal(str)) {} - // Implicit consructor of a `string_view` from a `const char*` and length + // Implicit constructor of a `string_view` from a `const char*` and length. constexpr string_view(const char* data, size_type len) : ptr_(data), length_(CheckLengthInternal(len)) {} @@ -324,7 +324,7 @@ class string_view { // Explicit conversion operators - // Supports conversion to both `std::basic_string` where available. + // Converts to `std::basic_string`. template explicit operator std::basic_string() const { if (!data()) return {}; diff --git a/absl/time/time.h b/absl/time/time.h index 17dbfa6f..093f168d 100644 --- a/absl/time/time.h +++ b/absl/time/time.h @@ -477,11 +477,11 @@ inline std::ostream& operator<<(std::ostream& os, Duration d) { // ParseDuration() // -// Parses a duration std::string consisting of a possibly signed sequence -// of decimal numbers, each with an optional fractional part and a -// unit suffix. The valid suffixes are "ns", "us" "ms", "s", "m", -// and "h". Simple examples include "300ms", "-1.5h", and "2h45m". -// Parses "inf" and "-inf" as +/- `InfiniteDuration()`. +// Parses a duration std::string consisting of a possibly signed sequence of +// decimal numbers, each with an optional fractional part and a unit +// suffix. The valid suffixes are "ns", "us" "ms", "s", "m", and "h". +// Simple examples include "300ms", "-1.5h", and "2h45m". Parses "0" as +// `ZeroDuration()`. Parses "inf" and "-inf" as +/- `InfiniteDuration()`. bool ParseDuration(const std::string& dur_string, Duration* d); // Flag Support -- cgit v1.2.3