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 /element_detection.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 'element_detection.cc')
-rw-r--r-- | element_detection.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/element_detection.cc b/element_detection.cc index bec16be..8682c78 100644 --- a/element_detection.cc +++ b/element_detection.cc @@ -118,11 +118,11 @@ std::unique_ptr<Disassembler> MakeDisassemblerOfType(ConstBufferView image, } } -base::Optional<Element> DetectElementFromDisassembler(ConstBufferView image) { +absl::optional<Element> DetectElementFromDisassembler(ConstBufferView image) { std::unique_ptr<Disassembler> disasm = MakeDisassemblerWithoutFallback(image); if (disasm) return Element({0, disasm->size()}, disasm->GetExeType()); - return base::nullopt; + return absl::nullopt; } /******** ProgramScanner ********/ @@ -132,18 +132,18 @@ ElementFinder::ElementFinder(ConstBufferView image, ElementDetector&& detector) ElementFinder::~ElementFinder() = default; -base::Optional<Element> ElementFinder::GetNext() { +absl::optional<Element> ElementFinder::GetNext() { for (; pos_ < image_.size(); ++pos_) { ConstBufferView test_image = ConstBufferView::FromRange(image_.begin() + pos_, image_.end()); - base::Optional<Element> element = detector_.Run(test_image); + absl::optional<Element> element = detector_.Run(test_image); if (element) { element->offset += pos_; pos_ = element->EndOffset(); return element; } } - return base::nullopt; + return absl::nullopt; } } // namespace zucchini |