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

chore: fix compile errors (#30903)

Browse source
This commit is contained in:
Samuel Attard 2021-09-09 19:52:23 -07:00 • committed by GitHub
parent 57d088517c
commit fb539f15d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shell/common/asar/archive.cc
View file

@ -157,6 +157,15 @@ bool FillFileInfoWithNode(Archive::FileInfo* info,
} // namespace
IntegrityPayload::IntegrityPayload()
: algorithm(HashAlgorithm::NONE), block_size(0) {}
IntegrityPayload::~IntegrityPayload() = default;
IntegrityPayload::IntegrityPayload(const IntegrityPayload& other) = default;
Archive::FileInfo::FileInfo()
: unpacked(false), executable(false), size(0), offset(0) {}
Archive::FileInfo::~FileInfo() = default;
Archive::Archive(const base::FilePath& path)
: initialized_(false), path_(path), file_(base::File::FILE_OK) {
base::ThreadRestrictions::ScopedAllowIO allow_io;
@ -270,11 +279,11 @@ bool Archive::Init() {
#if !defined(OS_MAC)
absl::optional<IntegrityPayload> Archive::HeaderIntegrity() const {
return absl::optional<IntegrityPayload>();
return absl::nullopt;
}
absl::optional<base::FilePath> Archive::RelativePath() const {
return absl::optional<base::FilePath>();
return absl::nullopt;
}
#endif

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

@ -29,7 +29,9 @@ enum HashAlgorithm {
};
struct IntegrityPayload {
IntegrityPayload() : algorithm(HashAlgorithm::NONE), block_size(0) {}
IntegrityPayload();
~IntegrityPayload();
IntegrityPayload(const IntegrityPayload& other);
HashAlgorithm algorithm;
std::string hash;
uint32_t block_size;
@ -41,7 +43,8 @@ struct IntegrityPayload {
class Archive {
public:
struct FileInfo {
FileInfo() : unpacked(false), executable(false), size(0), offset(0) {}
FileInfo();
~FileInfo();
bool unpacked;
bool executable;
uint32_t size;