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 /rel32_finder.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 'rel32_finder.h')
-rw-r--r-- | rel32_finder.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rel32_finder.h b/rel32_finder.h index b70b1be..5953755 100644 --- a/rel32_finder.h +++ b/rel32_finder.h @@ -10,9 +10,9 @@ #include <vector> #include "base/macros.h" -#include "base/optional.h" #include "components/zucchini/buffer_view.h" #include "components/zucchini/image_utils.h" +#include "third_party/abseil-cpp/absl/types/optional.h" namespace zucchini { @@ -52,7 +52,7 @@ class Abs32GapFinder { ~Abs32GapFinder(); // Returns the next available gap, or nullopt if exhausted. - base::Optional<ConstBufferView> GetNext(); + absl::optional<ConstBufferView> GetNext(); private: const ConstBufferView::const_iterator base_; @@ -134,10 +134,10 @@ class Rel32FinderIntel : public Rel32Finder { using Rel32Finder::Rel32Finder; // Returns the next available Result, or nullopt if exhausted. - base::Optional<Result> GetNext() { + absl::optional<Result> GetNext() { if (FindNext()) return rel32_; - return base::nullopt; + return absl::nullopt; } protected: |