summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2018-08-10 11:15:46 -0700
committerGravatar Derek Mauro <dmauro@google.com>2018-08-10 15:16:16 -0400
commit86f0fe93ad9d6d033a319476736a3256369c1f75 (patch)
tree594b745c8fc2453fd4c1af9e765423b20e61fa49
parentf0f15c2778b0e4959244dd25e63f445a455870f5 (diff)
Export of internal Abseil changes.
-- 9850e5567db4ab7cf4928e68d1c6e232d9845fff by Abseil Team <absl-team@google.com>: Add missing file parameter for FPrintF example. PiperOrigin-RevId: 208238843 -- e3aa5daed78a2d38f0f19c20db93d6b9cca54041 by Abseil Team <absl-team@google.com>: Internal cleanup. PiperOrigin-RevId: 208216296 -- 6ec960705441f7ae7383214160cf78244b0ac614 by Abseil Team <absl-team@google.com>: Import of CCTZ from GitHub. PiperOrigin-RevId: 208111059 GitOrigin-RevId: 9850e5567db4ab7cf4928e68d1c6e232d9845fff Change-Id: I3ceef9b66ffc8d434eb522f79479581975e780e6
-rw-r--r--absl/strings/BUILD.bazel2
-rw-r--r--absl/strings/str_format.h2
-rw-r--r--absl/time/internal/cctz/include/cctz/civil_time_detail.h4
3 files changed, 3 insertions, 5 deletions
diff --git a/absl/strings/BUILD.bazel b/absl/strings/BUILD.bazel
index 6caf8b97..0cb752b5 100644
--- a/absl/strings/BUILD.bazel
+++ b/absl/strings/BUILD.bazel
@@ -213,7 +213,6 @@ cc_test(
visibility = ["//visibility:private"],
deps = [
":internal",
- ":strings",
"//absl/base:core_headers",
"@com_google_googletest//:gtest_main",
],
@@ -375,7 +374,6 @@ cc_test(
visibility = ["//visibility:private"],
deps = [
":strings",
- "//absl/memory",
"@com_github_google_benchmark//:benchmark_main",
],
)
diff --git a/absl/strings/str_format.h b/absl/strings/str_format.h
index 70a811b7..9f44c713 100644
--- a/absl/strings/str_format.h
+++ b/absl/strings/str_format.h
@@ -368,7 +368,7 @@ int PrintF(const FormatSpec<Args...>& format, const Args&... args) {
// Example:
//
// std::string_view s = "Ulaanbaatar";
-// absl::FPrintF("The capital of Mongolia is %s", s);
+// absl::FPrintF(stdout, "The capital of Mongolia is %s", s);
//
// Outputs: "The capital of Mongolia is Ulaanbaatar"
//
diff --git a/absl/time/internal/cctz/include/cctz/civil_time_detail.h b/absl/time/internal/cctz/include/cctz/civil_time_detail.h
index 2362a4f4..f831258f 100644
--- a/absl/time/internal/cctz/include/cctz/civil_time_detail.h
+++ b/absl/time/internal/cctz/include/cctz/civil_time_detail.h
@@ -355,11 +355,11 @@ class civil_time {
: civil_time(ct.f_) {}
// Factories for the maximum/minimum representable civil_time.
- static civil_time max() {
+ static CONSTEXPR_F civil_time max() {
const auto max_year = std::numeric_limits<std::int_least64_t>::max();
return civil_time(max_year, 12, 31, 23, 59, 59);
}
- static civil_time min() {
+ static CONSTEXPR_F civil_time min() {
const auto min_year = std::numeric_limits<std::int_least64_t>::min();
return civil_time(min_year, 1, 1, 0, 0, 0);
}