summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2020-04-20 18:19:20 -0700
committerGravatar Derek Mauro <dmauro@google.com>2020-04-21 14:10:36 -0400
commitcb52b05ea20e8d196f17b45a420c2d323e401324 (patch)
tree0dc88cf77484e8b59d2714f1165e5305913f106c
parent1a02b7a2054c24f900dab796edb812f9260b51a6 (diff)
Export of internal Abseil changes
-- adcea274552c5671bdafae7f85797c49c9639b67 by Abseil Team <absl-team@google.com>: change some const declarations to constexpr PiperOrigin-RevId: 307516528 -- f828d23bdd437f38ae52ba232fd44c477643ddaf by Derek Mauro <dmauro@google.com>: Use "-lrt" instead of the resolved find_library result when linking librt. find_library defaults to shared objects. Imports #665. PiperOrigin-RevId: 307465639 GitOrigin-RevId: adcea274552c5671bdafae7f85797c49c9639b67 Change-Id: I8f562ef8f57f5ed55192936c764fa6532e3b8adb
-rw-r--r--absl/strings/cord.h6
-rw-r--r--absl/synchronization/internal/waiter.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/absl/strings/cord.h b/absl/strings/cord.h
index 9d99b2af..ae3d2e71 100644
--- a/absl/strings/cord.h
+++ b/absl/strings/cord.h
@@ -645,12 +645,12 @@ class Cord {
// InlineRep holds either a tree pointer, or an array of kMaxInline bytes.
class InlineRep {
public:
- static const unsigned char kMaxInline = 15;
+ static constexpr unsigned char kMaxInline = 15;
static_assert(kMaxInline >= sizeof(absl::cord_internal::CordRep*), "");
// Tag byte & kMaxInline means we are storing a pointer.
- static const unsigned char kTreeFlag = 1 << 4;
+ static constexpr unsigned char kTreeFlag = 1 << 4;
// Tag byte & kProfiledFlag means we are profiling the Cord.
- static const unsigned char kProfiledFlag = 1 << 5;
+ static constexpr unsigned char kProfiledFlag = 1 << 5;
constexpr InlineRep() : data_{} {}
InlineRep(const InlineRep& src);
diff --git a/absl/synchronization/internal/waiter.h b/absl/synchronization/internal/waiter.h
index a6e6d4c7..ae83907b 100644
--- a/absl/synchronization/internal/waiter.h
+++ b/absl/synchronization/internal/waiter.h
@@ -101,7 +101,7 @@ class Waiter {
// How many periods to remain idle before releasing resources
#ifndef THREAD_SANITIZER
- static const int kIdlePeriods = 60;
+ static constexpr int kIdlePeriods = 60;
#else
// Memory consumption under ThreadSanitizer is a serious concern,
// so we release resources sooner. The value of 1 leads to 1 to 2 second