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 /zucchini_apply.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 'zucchini_apply.cc')
| -rw-r--r-- | zucchini_apply.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zucchini_apply.cc b/zucchini_apply.cc index 2d001a1..10c5638 100644 --- a/zucchini_apply.cc +++ b/zucchini_apply.cc @@ -32,7 +32,7 @@ bool ApplyEquivalenceAndExtraData(ConstBufferView old_image, CHECK(next_dst_it >= dst_it); offset_t gap = static_cast<offset_t>(next_dst_it - dst_it); - base::Optional<ConstBufferView> extra_data = extra_data_source.GetNext(gap); + absl::optional<ConstBufferView> extra_data = extra_data_source.GetNext(gap); if (!extra_data) { LOG(ERROR) << "Error reading extra_data"; return false; @@ -46,7 +46,7 @@ bool ApplyEquivalenceAndExtraData(ConstBufferView old_image, CHECK_EQ(dst_it, next_dst_it + equivalence->length); } offset_t gap = static_cast<offset_t>(new_image.end() - dst_it); - base::Optional<ConstBufferView> extra_data = extra_data_source.GetNext(gap); + absl::optional<ConstBufferView> extra_data = extra_data_source.GetNext(gap); if (!extra_data) { LOG(ERROR) << "Error reading extra_data"; return false; |