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 /disassembler_ztf.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 'disassembler_ztf.cc')
-rw-r--r-- | disassembler_ztf.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/disassembler_ztf.cc b/disassembler_ztf.cc index c54a7b0..f822d8b 100644 --- a/disassembler_ztf.cc +++ b/disassembler_ztf.cc @@ -290,7 +290,7 @@ class ZtfReferenceReader : public ReferenceReader { // Walks |offset_| from |lo| to |hi_| running |parser_|. If any matches are // found they are returned. - base::Optional<Reference> GetNext() override { + absl::optional<Reference> GetNext() override { T line_col; for (; offset_ < hi_; ++offset_) { if (!parser_.MatchAtOffset(offset_, &line_col)) @@ -304,7 +304,7 @@ class ZtfReferenceReader : public ReferenceReader { offset_ += config_.Width(line_col); return Reference{location, target}; } - return base::nullopt; + return absl::nullopt; } private: @@ -456,12 +456,12 @@ offset_t ZtfTranslator::LineColToOffset(ztf::LineCol lc) const { return target; } -base::Optional<ztf::LineCol> ZtfTranslator::OffsetToLineCol( +absl::optional<ztf::LineCol> ZtfTranslator::OffsetToLineCol( offset_t offset) const { DCHECK(!line_starts_.empty()); // Don't place a target outside the image. if (offset >= line_starts_.back()) - return base::nullopt; + return absl::nullopt; auto it = SearchForRange(offset); ztf::LineCol lc; lc.line = std::distance(line_starts_.cbegin(), it) + 1; |