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 /abs32_utils.cc | |
| 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 'abs32_utils.cc')
| -rw-r--r-- | abs32_utils.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/abs32_utils.cc b/abs32_utils.cc index 5d3d6ea..ad1c85e 100644 --- a/abs32_utils.cc +++ b/abs32_utils.cc @@ -110,7 +110,7 @@ Abs32RvaExtractorWin32::Abs32RvaExtractorWin32(Abs32RvaExtractorWin32&&) = Abs32RvaExtractorWin32::~Abs32RvaExtractorWin32() = default; -base::Optional<Abs32RvaExtractorWin32::Unit> Abs32RvaExtractorWin32::GetNext() { +absl::optional<Abs32RvaExtractorWin32::Unit> Abs32RvaExtractorWin32::GetNext() { while (cur_abs32_ < end_abs32_) { offset_t location = *(cur_abs32_++); if (!addr_.Read(location, image_)) @@ -120,7 +120,7 @@ base::Optional<Abs32RvaExtractorWin32::Unit> Abs32RvaExtractorWin32::GetNext() { continue; return Unit{location, target_rva}; } - return base::nullopt; + return absl::nullopt; } /******** Abs32ReaderWin32 ********/ @@ -132,7 +132,7 @@ Abs32ReaderWin32::Abs32ReaderWin32(Abs32RvaExtractorWin32&& abs32_rva_extractor, Abs32ReaderWin32::~Abs32ReaderWin32() = default; -base::Optional<Reference> Abs32ReaderWin32::GetNext() { +absl::optional<Reference> Abs32ReaderWin32::GetNext() { for (auto unit = abs32_rva_extractor_.GetNext(); unit.has_value(); unit = abs32_rva_extractor_.GetNext()) { offset_t location = unit->location; @@ -140,7 +140,7 @@ base::Optional<Reference> Abs32ReaderWin32::GetNext() { if (unsafe_target != kInvalidOffset) return Reference{location, unsafe_target}; } - return base::nullopt; + return absl::nullopt; } /******** Abs32WriterWin32 ********/ |