From b290415bbd04bf10e188178d130a0247159010ee Mon Sep 17 00:00:00 2001 From: "ali.ibrahim" Date: Wed, 12 Oct 2016 19:41:13 +0200 Subject: [PATCH] Fixing build on Mac OS --- atom/browser/api/atom_api_url_request.h | 2 +- atom/browser/net/atom_url_request.cc | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/atom/browser/api/atom_api_url_request.h b/atom/browser/api/atom_api_url_request.h index c10b542856fe..71e6a81ca284 100644 --- a/atom/browser/api/atom_api_url_request.h +++ b/atom/browser/api/atom_api_url_request.h @@ -213,7 +213,7 @@ template std::array, sizeof...(ArgTypes)> URLRequest::BuildArgsArray(ArgTypes... args) const { std::array, sizeof...(ArgTypes)> result - = { mate::ConvertToV8(isolate(), args)... }; + = { { mate::ConvertToV8(isolate(), args)... } }; return result; } diff --git a/atom/browser/net/atom_url_request.cc b/atom/browser/net/atom_url_request.cc index d795b0b51829..c5d5b9b42d77 100644 --- a/atom/browser/net/atom_url_request.cc +++ b/atom/browser/net/atom_url_request.cc @@ -51,8 +51,8 @@ class UploadOwnedIOBufferElementReader : public net::UploadBytesElementReader { AtomURLRequest::AtomURLRequest(base::WeakPtr 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);