From 9087a1dc918399c38a3e18fdf0cbc2d0135512c4 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 3 Nov 2017 18:59:42 +0100 Subject: [PATCH 1/2] src: fix -Winconsistent-missing-override warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a compiler warning that was introduced in commit 4db1bc8f205 ("http2: allocate on every chunk send") by adding an `override` keyword. PR-URL: https://github.com/nodejs/node/pull/16726 Reviewed-By: Anatoli Papirovski Reviewed-By: Colin Ihrig Reviewed-By: Daniel Bevenius Reviewed-By: Franziska Hinkelmann Reviewed-By: James M Snell Reviewed-By: Michael Dawson Reviewed-By: Michaël Zasso --- src/node_http2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_http2.h b/src/node_http2.h index 9454301ec4665e..1fee25a8d054b0 100644 --- a/src/node_http2.h +++ b/src/node_http2.h @@ -431,7 +431,7 @@ class Http2Session : public AsyncWrap, const SubmitTrailers& submit_trailers) override; void Send(WriteWrap* req, char* buf, size_t length) override; - WriteWrap* AllocateSend(); + WriteWrap* AllocateSend() override; int DoWrite(WriteWrap* w, uv_buf_t* bufs, size_t count, uv_stream_t* send_handle) override; From 02bad59f003d03bf64c59874cd31bd29202a194a Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Fri, 3 Nov 2017 18:59:42 +0100 Subject: [PATCH 2/2] src: fix -Wunused-result warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a compiler warning that was introduced in commit c3dc0e0d75c ("src: add CollectExceptionInfo & errors.SystemError") by adding a `.FromJust()` call. PR-URL: https://github.com/nodejs/node/pull/16726 Reviewed-By: Anatoli Papirovski Reviewed-By: Colin Ihrig Reviewed-By: Daniel Bevenius Reviewed-By: Franziska Hinkelmann Reviewed-By: James M Snell Reviewed-By: Michael Dawson Reviewed-By: Michaël Zasso --- src/env.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/env.cc b/src/env.cc index 9bed08cdb09175..6abb224293c26f 100644 --- a/src/env.cc +++ b/src/env.cc @@ -263,7 +263,7 @@ void CollectExceptionInfo(Environment* env, if (syscall != nullptr) { obj->Set(env->context(), env->syscall_string(), - OneByteString(env->isolate(), syscall)); + OneByteString(env->isolate(), syscall)).FromJust(); } }