diff options
| -rw-r--r-- | absl/container/btree_test.cc | 7 | ||||
| -rw-r--r-- | absl/container/internal/btree.h | 9 | ||||
| -rw-r--r-- | absl/debugging/symbolize_test.cc | 4 | ||||
| -rw-r--r-- | absl/random/uniform_real_distribution.h | 2 | ||||
| -rw-r--r-- | absl/time/clock.cc | 2 | ||||
| -rw-r--r-- | absl/types/internal/optional.h | 4 | ||||
| -rw-r--r-- | absl/types/optional_test.cc | 6 |
7 files changed, 23 insertions, 11 deletions
diff --git a/absl/container/btree_test.cc b/absl/container/btree_test.cc index 4edb2775be86..48f70cb0a5ce 100644 --- a/absl/container/btree_test.cc +++ b/absl/container/btree_test.cc @@ -2239,6 +2239,13 @@ TEST(Btree, MoveAssignmentAllocatorPropagation) { } } +TEST(Btree, EmptyTree) { + absl::btree_set<int> s; + EXPECT_TRUE(s.empty()); + EXPECT_EQ(s.size(), 0); + EXPECT_GT(s.max_size(), 0); +} + } // namespace } // namespace container_internal } // namespace absl diff --git a/absl/container/internal/btree.h b/absl/container/internal/btree.h index b255984174e6..cf7ef02cccc5 100644 --- a/absl/container/internal/btree.h +++ b/absl/container/internal/btree.h @@ -1226,7 +1226,7 @@ class btree { // The height of the btree. An empty tree will have height 0. size_type height() const { size_type h = 0; - if (root()) { + if (!empty()) { // Count the length of the chain from the leftmost node up to the // root. We actually count from the root back around to the level below // the root, but the calculation is the same because of the circularity @@ -1277,16 +1277,17 @@ class btree { // divided by the maximum number of elements a tree with the current number // of nodes could hold. A value of 1 indicates perfect space // utilization. Smaller values indicate space wastage. + // Returns 0 for empty trees. double fullness() const { + if (empty()) return 0.0; return static_cast<double>(size()) / (nodes() * kNodeValues); } // The overhead of the btree structure in bytes per node. Computed as the // total number of bytes used by the btree minus the number of bytes used for // storing elements divided by the number of elements. + // Returns 0 for empty trees. double overhead() const { - if (empty()) { - return 0.0; - } + if (empty()) return 0.0; return (bytes_used() - size() * sizeof(value_type)) / static_cast<double>(size()); } diff --git a/absl/debugging/symbolize_test.cc b/absl/debugging/symbolize_test.cc index 08068c307fdd..533799a6ebcf 100644 --- a/absl/debugging/symbolize_test.cc +++ b/absl/debugging/symbolize_test.cc @@ -80,6 +80,7 @@ static ABSL_PER_THREAD_TLS_KEYWORD char symbolize_test_thread_big[2 * 1024 * 1024]; #endif +#if !defined(__EMSCRIPTEN__) // Used below to hopefully inhibit some compiler/linker optimizations // that may remove kHpageTextPadding, kPadding0, and kPadding1 from // the binary. @@ -89,6 +90,7 @@ static volatile bool volatile_bool = false; static constexpr size_t kHpageSize = 1 << 21; const char kHpageTextPadding[kHpageSize * 4] ABSL_ATTRIBUTE_SECTION_VARIABLE( .text) = ""; +#endif // !defined(__EMSCRIPTEN__) static char try_symbolize_buffer[4096]; @@ -498,10 +500,12 @@ TEST(Symbolize, Unimplemented) { #endif int main(int argc, char **argv) { +#if !defined(__EMSCRIPTEN__) // Make sure kHpageTextPadding is linked into the binary. if (volatile_bool) { ABSL_RAW_LOG(INFO, "%s", kHpageTextPadding); } +#endif // !defined(__EMSCRIPTEN__) #if ABSL_PER_THREAD_TLS // Touch the per-thread variables. diff --git a/absl/random/uniform_real_distribution.h b/absl/random/uniform_real_distribution.h index 600f915b67af..336abb3907bf 100644 --- a/absl/random/uniform_real_distribution.h +++ b/absl/random/uniform_real_distribution.h @@ -56,7 +56,7 @@ namespace absl { // // // Use the distribution to produce a value between 0.0 (inclusive) // // and 1.0 (exclusive). -// int value = absl::uniform_real_distribution<double>(0, 1)(gen); +// double value = absl::uniform_real_distribution<double>(0, 1)(gen); // template <typename RealType = double> class uniform_real_distribution { diff --git a/absl/time/clock.cc b/absl/time/clock.cc index fa0ed34d1dca..bc6f5ccf2763 100644 --- a/absl/time/clock.cc +++ b/absl/time/clock.cc @@ -449,7 +449,7 @@ static uint64_t UpdateLastSample(uint64_t now_cycles, uint64_t now_ns, last_sample.min_cycles_per_sample.store(0, std::memory_order_relaxed); stats_initializations++; } else if (sample->raw_ns + 500 * 1000 * 1000 < now_ns && - sample->base_cycles + 100 < now_cycles) { + sample->base_cycles + 50 < now_cycles) { // Enough time has passed to compute the cycle time. if (sample->nsscaled_per_cycle != 0) { // Have a cycle time estimate. // Compute time from counter reading, but avoiding overflow diff --git a/absl/types/internal/optional.h b/absl/types/internal/optional.h index 8acbda20d559..d41ccc75f6f6 100644 --- a/absl/types/internal/optional.h +++ b/absl/types/internal/optional.h @@ -84,8 +84,8 @@ class optional_data_dtor_base { bool engaged_; // Data storage union { - dummy_type dummy_; T data_; + dummy_type dummy_; }; void destruct() noexcept { @@ -119,8 +119,8 @@ class optional_data_dtor_base<T, true> { bool engaged_; // Data storage union { - dummy_type dummy_; T data_; + dummy_type dummy_; }; void destruct() noexcept { engaged_ = false; } diff --git a/absl/types/optional_test.cc b/absl/types/optional_test.cc index e005affb4ce6..35efa8635077 100644 --- a/absl/types/optional_test.cc +++ b/absl/types/optional_test.cc @@ -944,7 +944,7 @@ TEST(optionalTest, Swap) { template <int v> struct DeletedOpAddr { - constexpr static const int value = v; + int value = v; constexpr DeletedOpAddr() = default; constexpr const DeletedOpAddr<v>* operator&() const = delete; // NOLINT DeletedOpAddr<v>* operator&() = delete; // NOLINT @@ -954,9 +954,9 @@ struct DeletedOpAddr { // to document the fact that the current implementation of absl::optional<T> // expects such usecases to be malformed and not compile. TEST(optionalTest, OperatorAddr) { - constexpr const int v = -1; + constexpr int v = -1; { // constexpr - constexpr const absl::optional<DeletedOpAddr<v>> opt(absl::in_place_t{}); + constexpr absl::optional<DeletedOpAddr<v>> opt(absl::in_place_t{}); static_assert(opt.has_value(), ""); // static_assert(opt->value == v, ""); static_assert((*opt).value == v, ""); |