From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/base/containers/vector_buffer.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'chromium/base/containers/vector_buffer.h') diff --git a/chromium/base/containers/vector_buffer.h b/chromium/base/containers/vector_buffer.h index 83cd2ac139e..019913cce23 100644 --- a/chromium/base/containers/vector_buffer.h +++ b/chromium/base/containers/vector_buffer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_CONTAINERS_VECTOR_BUFFERS_H_ -#define BASE_CONTAINERS_VECTOR_BUFFERS_H_ +#ifndef BASE_CONTAINERS_VECTOR_BUFFER_H_ +#define BASE_CONTAINERS_VECTOR_BUFFER_H_ #include #include @@ -11,9 +11,8 @@ #include #include +#include "base/check_op.h" #include "base/containers/util.h" -#include "base/logging.h" -#include "base/macros.h" #include "base/numerics/checked_math.h" namespace base { @@ -57,6 +56,9 @@ class VectorBuffer { other.capacity_ = 0; } + VectorBuffer(const VectorBuffer&) = delete; + VectorBuffer& operator=(const VectorBuffer&) = delete; + ~VectorBuffer() { free(buffer_); } VectorBuffer& operator=(VectorBuffer&& other) { @@ -178,11 +180,9 @@ class VectorBuffer { T* buffer_ = nullptr; size_t capacity_ = 0; - - DISALLOW_COPY_AND_ASSIGN(VectorBuffer); }; } // namespace internal } // namespace base -#endif // BASE_CONTAINERS_VECTOR_BUFFERS_H_ +#endif // BASE_CONTAINERS_VECTOR_BUFFER_H_ -- cgit v1.2.1