Accommodate libc++ upgrade and C++20 am: 2371d51bf5 am: ec5065e27e am: 40c72f5508
Original change: https://android-review.googlesource.com/c/platform/external/libchrome/+/2903122
Change-Id: I7530d1f5b0f42eee7e85a8099d6cf706110f0bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/base/containers/stack_container.h b/base/containers/stack_container.h
index c775744..980da07 100644
--- a/base/containers/stack_container.h
+++ b/base/containers/stack_container.h
@@ -35,7 +35,7 @@
template<typename T, size_t stack_capacity>
class StackAllocator : public std::allocator<T> {
public:
- typedef typename std::allocator<T>::pointer pointer;
+ typedef T* pointer;
typedef typename std::allocator<T>::size_type size_type;
// Backing store for the allocator. The container owner is responsible for
@@ -102,13 +102,13 @@
// Actually do the allocation. Use the stack buffer if nobody has used it yet
// and the size requested fits. Otherwise, fall through to the standard
// allocator.
- pointer allocate(size_type n, void* hint = 0) {
+ pointer allocate(size_type n) {
if (source_ != NULL && !source_->used_stack_buffer_
&& n <= stack_capacity) {
source_->used_stack_buffer_ = true;
return source_->stack_buffer();
} else {
- return std::allocator<T>::allocate(n, hint);
+ return std::allocator<T>::allocate(n);
}
}
diff --git a/base/value_iterators.cc b/base/value_iterators.cc
index ba9c730..4765f73 100644
--- a/base/value_iterators.cc
+++ b/base/value_iterators.cc
@@ -4,6 +4,8 @@
#include "base/value_iterators.h"
+#include "base/values.h"
+
namespace base {
namespace detail {