ba351af452
submit again #23290 (not upgrade brpc, because bthread local has error) protobuf 3.15.0 -> 21.11 glog 0.4.0 -> 0.6.0 lz4 1.9.3 -> 1.9.4 curl 7.79.0 -> 8.2.1 zstd 1.5.2 -> 1.5.5 arrow 7.0.0 -> 13.0.0 abseil 20220623.1 -> 20230125.3 orc 1.7.2 -> 1.9.0 jemalloc for arrow 5.2.1 -> 5.3.0 xsimd 7.0.0 -> 13.0.0 opentelemetry-proto 0.19.0 -> 1.0.0 opentelemetry 1.8.3 -> 1.10.0 new: c-ares -> 1.19.1 grpc -> 1.54.3
21 lines
864 B
Diff
21 lines
864 B
Diff
diff --git a/absl/container/internal/btree.h b/absl/container/internal/btree.h
|
|
index d734676a..43216318 100644
|
|
--- a/absl/container/internal/btree.h
|
|
+++ b/absl/container/internal/btree.h
|
|
@@ -76,16 +76,6 @@ namespace absl {
|
|
ABSL_NAMESPACE_BEGIN
|
|
namespace container_internal {
|
|
|
|
-#ifdef ABSL_BTREE_ENABLE_GENERATIONS
|
|
-#error ABSL_BTREE_ENABLE_GENERATIONS cannot be directly set
|
|
-#elif defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
|
|
- defined(ABSL_HAVE_MEMORY_SANITIZER)
|
|
-// When compiled in sanitizer mode, we add generation integers to the nodes and
|
|
-// iterators. When iterators are used, we validate that the container has not
|
|
-// been mutated since the iterator was constructed.
|
|
-#define ABSL_BTREE_ENABLE_GENERATIONS
|
|
-#endif
|
|
-
|
|
template <typename Compare, typename T, typename U>
|
|
using compare_result_t = absl::result_of_t<const Compare(const T &, const U &)>;
|