mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: replace absl::optional<T> with std::optional<T> (#40928)

Browse source 
* chore: replace absl::optional<T> with std::optional<T>

* IWYU
This commit is contained in:
Milan Burda 2024-01-10 23:23:35 +01:00 • committed by GitHub
parent fac964ac0d
commit 892c9d78a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
129 changed files with 419 additions and 397 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shell/common/asar/archive.h
View file

@ -6,6 +6,7 @@
#define ELECTRON_SHELL_COMMON_ASAR_ARCHIVE_H_
#include <memory>
#include <optional>
#include <string>
#include <unordered_map>
#include <vector>
@ -16,7 +17,6 @@
#include "base/files/file_path.h"
#include "base/synchronization/lock.h"
#include "base/values.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
namespace asar {
@ -48,7 +48,7 @@ class Archive {
bool executable;
uint32_t size;
uint64_t offset;
absl::optional<IntegrityPayload> integrity;
std::optional<IntegrityPayload> integrity;
};
enum class FileType {
@ -71,8 +71,8 @@ class Archive {
// Read and parse the header.
bool Init();
absl::optional<IntegrityPayload> HeaderIntegrity() const;
absl::optional<base::FilePath> RelativePath() const;
std::optional<IntegrityPayload> HeaderIntegrity() const;
std::optional<base::FilePath> RelativePath() const;
// Get the info of a file.
bool GetFileInfo(const base::FilePath& path, FileInfo* info) const;
@ -106,7 +106,7 @@ class Archive {
base::File file_;
int fd_ = -1;
uint32_t header_size_ = 0;
absl::optional<base::Value::Dict> header_;
std::optional<base::Value::Dict> header_;
// Cached external temporary files.
base::Lock external_files_lock_;