diff options
| -rw-r--r-- | absl/container/BUILD.bazel | 1 | ||||
| -rw-r--r-- | absl/container/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | absl/container/btree_test.cc | 3 | ||||
| -rw-r--r-- | absl/container/internal/btree.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/absl/container/BUILD.bazel b/absl/container/BUILD.bazel index e69c44d8..b9b3f7bb 100644 --- a/absl/container/BUILD.bazel +++ b/absl/container/BUILD.bazel @@ -959,7 +959,6 @@ cc_test( "//absl/flags:flag", "//absl/hash:hash_testing", "//absl/memory", - "//absl/meta:type_traits", "//absl/strings", "//absl/types:compare", "@com_google_googletest//:gtest_main", diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt index 9b5c59a4..4155f335 100644 --- a/absl/container/CMakeLists.txt +++ b/absl/container/CMakeLists.txt @@ -81,7 +81,6 @@ absl_cc_test( absl::raw_logging_internal absl::strings absl::test_instance_tracker - absl::type_traits GTest::gmock_main ) diff --git a/absl/container/btree_test.cc b/absl/container/btree_test.cc index f20f3430..4dae02c3 100644 --- a/absl/container/btree_test.cc +++ b/absl/container/btree_test.cc @@ -18,6 +18,7 @@ #include <array> #include <cstdint> #include <functional> +#include <iterator> #include <limits> #include <map> #include <memory> @@ -26,6 +27,7 @@ #include <string> #include <type_traits> #include <utility> +#include <vector> #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -38,7 +40,6 @@ #include "absl/flags/flag.h" #include "absl/hash/hash_testing.h" #include "absl/memory/memory.h" -#include "absl/meta/type_traits.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" diff --git a/absl/container/internal/btree.h b/absl/container/internal/btree.h index 01f4e749..64a610a0 100644 --- a/absl/container/internal/btree.h +++ b/absl/container/internal/btree.h @@ -1242,7 +1242,7 @@ class btree { // MSVC has constexpr code generations bugs here. EmptyNodeType() : parent(this) {} #else - constexpr EmptyNodeType(node_type *p) : parent(p) {} + explicit constexpr EmptyNodeType(node_type *p) : parent(p) {} #endif }; |