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

Fix compilation errors on OS X

Browse source
This commit is contained in:
Cheng Zhao 2016-03-08 23:28:53 +09:00
parent 4503aafe64
commit 5fae63a2f5
93 changed files with 242 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/common/asar/archive.cc
View file

@ -158,7 +158,7 @@ bool Archive::Init() {
}
uint32_t size;
if (!base::PickleIterator(base::Pickle(buf.data(), buf.size())).ReadUint32_t(
if (!base::PickleIterator(base::Pickle(buf.data(), buf.size())).ReadUInt32(
&size)) {
LOG(ERROR) << "Failed to parse header size from " << path_.value();
return false;
@ -296,7 +296,7 @@ bool Archive::CopyFileOut(const base::FilePath& path, base::FilePath* out) {
#endif
*out = temp_file->path();
external_files_.set(path, temp_file.Pass());
external_files_.set(path, std::move(temp_file));
return true;
}

2
atom/common/asar/archive.h
View file

@ -29,7 +29,7 @@ class Archive {
bool unpacked;
bool executable;
uint32_t size;
uint64 offset;
uint64_t offset;
};
struct Stats : public FileInfo {

2
atom/common/asar/scoped_temporary_file.cc
View file

@ -51,7 +51,7 @@ bool ScopedTemporaryFile::Init(const base::FilePath::StringType& ext) {
bool ScopedTemporaryFile::InitFromFile(base::File* src,
const base::FilePath::StringType& ext,
uint64 offset, uint64 size) {
uint64_t offset, uint64_t size) {
if (!src->IsValid())
return false;

2
atom/common/asar/scoped_temporary_file.h
View file

@ -28,7 +28,7 @@ class ScopedTemporaryFile {
// Init an temporary file and fill it with content of |path|.
bool InitFromFile(base::File* src,
const base::FilePath::StringType& ext,
uint64 offset, uint64 size);
uint64_t offset, uint64_t size);
base::FilePath path() const { return path_; }