diff options
| author | Samuel Huang <huangs@chromium.org> | 2021-08-13 15:42:26 +0000 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-08-13 08:54:54 -0700 |
| commit | f137bf4b5542b966abc4c08762c5e60b21913f4d (patch) | |
| tree | 09c6bdbdfaa7dd2f09d32a791a6aa364b0eeb2ba /abs32_utils.h | |
| parent | fa10b05c4854c6d8a603ee47c2a213cbc23f8646 (diff) | |
| download | zucchini-f137bf4b5542b966abc4c08762c5e60b21913f4d.tar.gz | |
[Zucchini] Replace DISALLOW_* macros with =delete versions.
This CL replaces
* 30 instances of DISALLOW_COPY_AND_ASSIGN(Foo),
* 1 instance of DISALLOW_IMPLICIT_CONSTRUCTORS(Foo),
in Zucchini with:
Foo() = delete; // DISALLOW_IMPLICIT_CONSTRUCTORS only.
Foo(const Foo&) = delete;
const Foo& operator=(const Foo&) = delete;
All base/macros.h includes are removed.
Bug: 1010217
Change-Id: I13b3d5ed04f04e5c0b209d59e70ac018c5f4938c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3093198
Reviewed-by: Etienne Pierre-Doray <etiennep@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#911751}
NOKEYCHECK=True
GitOrigin-RevId: ba0e1f56993c535faa59e2ca02c371bae2ebbb20
Diffstat (limited to 'abs32_utils.h')
| -rw-r--r-- | abs32_utils.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/abs32_utils.h b/abs32_utils.h index f13f562..07503b5 100644 --- a/abs32_utils.h +++ b/abs32_utils.h @@ -10,7 +10,6 @@ #include <vector> -#include "base/macros.h" #include "components/zucchini/address_translator.h" #include "components/zucchini/buffer_view.h" #include "components/zucchini/image_utils.h" @@ -94,6 +93,8 @@ class Abs32ReaderWin32 : public ReferenceReader { public: Abs32ReaderWin32(Abs32RvaExtractorWin32&& abs32_rva_extractor, const AddressTranslator& translator); + Abs32ReaderWin32(const Abs32ReaderWin32&) = delete; + const Abs32ReaderWin32& operator=(const Abs32ReaderWin32&) = delete; ~Abs32ReaderWin32() override; // ReferenceReader: @@ -102,8 +103,6 @@ class Abs32ReaderWin32 : public ReferenceReader { private: Abs32RvaExtractorWin32 abs32_rva_extractor_; AddressTranslator::RvaToOffsetCache target_rva_to_offset_; - - DISALLOW_COPY_AND_ASSIGN(Abs32ReaderWin32); }; // A writer for Win32 abs32 references. |addr| determines the bitness of the @@ -113,6 +112,8 @@ class Abs32WriterWin32 : public ReferenceWriter { Abs32WriterWin32(MutableBufferView image, AbsoluteAddress&& addr, const AddressTranslator& translator); + Abs32WriterWin32(const Abs32WriterWin32&) = delete; + const Abs32WriterWin32& operator=(const Abs32WriterWin32&) = delete; ~Abs32WriterWin32() override; // ReferenceWriter: @@ -122,8 +123,6 @@ class Abs32WriterWin32 : public ReferenceWriter { MutableBufferView image_; AbsoluteAddress addr_; AddressTranslator::OffsetToRvaCache target_offset_to_rva_; - - DISALLOW_COPY_AND_ASSIGN(Abs32WriterWin32); }; // Given a list of abs32 |locations|, removes all elements whose targets cannot |