Skip to content

Commit

Permalink
src: remove extra semis after member fns
Browse files Browse the repository at this point in the history
This was added in nodejs/node#34186 and
nodejs/node#38172.

Fix upstreamed at nodejs/node#38686.
  • Loading branch information
codebytere committed May 14, 2021
1 parent 6fcccf8 commit 23cab3e
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
1 change: 1 addition & 0 deletions patches/node/.patches
Expand Up @@ -33,3 +33,4 @@ build_add_mjs_support_to_js2c.patch
src_inline_asynccleanuphookhandle_in_headers.patch
fix_handle_new_tostring_behavior_in_v8_serdes_test.patch
node-api_faster_threadsafe_function.patch
src_remove_extra_semi_after_member_fn.patch
38 changes: 38 additions & 0 deletions patches/node/src_remove_extra_semi_after_member_fn.patch
@@ -0,0 +1,38 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 14 May 2021 13:55:28 +0200
Subject: src: remove extra semi after member fn

This was added in https://github.com/nodejs/node/pull/34186 and
https://github.com/nodejs/node/pull/38172.

Fix upstreamed at https://github.com/nodejs/node/pull/38686.

diff --git a/src/cares_wrap.h b/src/cares_wrap.h
index bceafcb8b7f46b8044c69716e7241d2fa065ee5c..20d350a76321e8414508083c2037ad8c238c940b 100644
--- a/src/cares_wrap.h
+++ b/src/cares_wrap.h
@@ -141,8 +141,8 @@ struct NodeAresTask final : public MemoryRetainer {
uv_poll_t poll_watcher;

inline void MemoryInfo(MemoryTracker* trakcer) const override;
- SET_MEMORY_INFO_NAME(NodeAresTask);
- SET_SELF_SIZE(NodeAresTask);
+ SET_MEMORY_INFO_NAME(NodeAresTask)
+ SET_SELF_SIZE(NodeAresTask)

struct Hash {
inline size_t operator()(NodeAresTask* a) const {
diff --git a/src/timer_wrap.h b/src/timer_wrap.h
index b2c20bf24d8746b5bc33ac2e55f20cd303dff269..dbc23b442bea39d4556a21bb7f365dd68239095d 100644
--- a/src/timer_wrap.h
+++ b/src/timer_wrap.h
@@ -32,7 +32,7 @@ class TimerWrap final : public MemoryRetainer {
void Ref();
void Unref();

- SET_NO_MEMORY_INFO();
+ SET_NO_MEMORY_INFO()
SET_MEMORY_INFO_NAME(TimerWrap)
SET_SELF_SIZE(TimerWrap)

0 comments on commit 23cab3e

Please sign in to comment.