github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-26 15:58:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixing build on Mac OS

Browse Source
This commit is contained in:
ali.ibrahim
2016-10-12 19:41:13 +02:00
parent 16069cd477
commit b290415bbd
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/browser/api/atom_api_url_request.h
View File

@@ -213,7 +213,7 @@ template <typename ... ArgTypes>
std::array<v8::Local<v8::Value>, sizeof...(ArgTypes)>
URLRequest::BuildArgsArray(ArgTypes... args) const {
std::array<v8::Local<v8::Value>, sizeof...(ArgTypes)> result
= { mate::ConvertToV8(isolate(), args)... };
= { { mate::ConvertToV8(isolate(), args)... } };
return result;
}

10
atom/browser/net/atom_url_request.cc
View File

@@ -51,8 +51,8 @@ class UploadOwnedIOBufferElementReader : public net::UploadBytesElementReader {
AtomURLRequest::AtomURLRequest(base::WeakPtr<api::URLRequest> delegate)
: delegate_(delegate),
response_read_buffer_(new net::IOBuffer(kBufferSize)),
is_chunked_upload_(false) {
is_chunked_upload_(false),
response_read_buffer_(new net::IOBuffer(kBufferSize)) {
}
AtomURLRequest::~AtomURLRequest() {
@@ -159,14 +159,12 @@ void AtomURLRequest::DoWriteBuffer(
if (buffer)
// Non-empty buffer.
auto write_result = chunked_stream_writer_->AppendData(
buffer->data(),
chunked_stream_writer_->AppendData(buffer->data(),
buffer->size(),
is_last);
else if (is_last)
// Empty buffer and last chunk, i.e. request.end().
auto write_result = chunked_stream_writer_->AppendData(
nullptr,
chunked_stream_writer_->AppendData(nullptr,
0,
true);