diff options
| author | Anton Bikineev <bikineev@chromium.org> | 2021-05-15 22:35:36 +0000 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-07-25 21:14:18 -0700 |
| commit | 1a96551a279242efef41468357e38d3091e884bc (patch) | |
| tree | 04fb6730d8927a839d99d24492555b877077317d /reloc_elf.h | |
| parent | 147f86be24a5ceb5447a9376fdc8c65044bb2977 (diff) | |
| download | zucchini-1a96551a279242efef41468357e38d3091e884bc.tar.gz | |
components: Replace base::Optional and friends with absl counterparts
This replaces:
- base::Optional -> absl::optional
- include "base/optional.h"
->
include "third_party/abseil-cpp/absl/types/optional.h"
- base::nullopt -> absl::nullopt
- base::make_optional -> absl::make_optional
Bug: 1202909
Change-Id: If697b7bf69b199c1796f873eedca3359cdb48c64
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2897151
Commit-Queue: Anton Bikineev <bikineev@chromium.org>
Owners-Override: Anton Bikineev <bikineev@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#883296}
NOKEYCHECK=True
GitOrigin-RevId: 1156b5f891de178171e71b9221a96bef1ced3d3b
Diffstat (limited to 'reloc_elf.h')
| -rw-r--r-- | reloc_elf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/reloc_elf.h b/reloc_elf.h index 7fcdbd3..ebf2577 100644 --- a/reloc_elf.h +++ b/reloc_elf.h @@ -11,11 +11,11 @@ #include <vector> #include "base/numerics/safe_conversions.h" -#include "base/optional.h" #include "components/zucchini/address_translator.h" #include "components/zucchini/buffer_view.h" #include "components/zucchini/image_utils.h" #include "components/zucchini/type_elf.h" +#include "third_party/abseil-cpp/absl/types/optional.h" namespace zucchini { @@ -68,7 +68,7 @@ class RelocReaderElf : public ReferenceReader { rva_t GetRelocationTarget(elf::Elf64_Rel rel) const; // ReferenceReader: - base::Optional<Reference> GetNext() override; + absl::optional<Reference> GetNext() override; private: const ConstBufferView image_; |