Skip to content

Commit 23cab3e

Browse files
committed
src: remove extra semis after member fns
This was added in nodejs/node#34186 and nodejs/node#38172. Fix upstreamed at nodejs/node#38686.
1 parent 6fcccf8 commit 23cab3e

2 files changed

Lines changed: 39 additions & 0 deletions

File tree

patches/node/.patches

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ build_add_mjs_support_to_js2c.patch
3333
src_inline_asynccleanuphookhandle_in_headers.patch
3434
fix_handle_new_tostring_behavior_in_v8_serdes_test.patch
3535
node-api_faster_threadsafe_function.patch
36+
src_remove_extra_semi_after_member_fn.patch
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Shelley Vohr <shelley.vohr@gmail.com>
3+
Date: Fri, 14 May 2021 13:55:28 +0200
4+
Subject: src: remove extra semi after member fn
5+
6+
This was added in https://github.com/nodejs/node/pull/34186 and
7+
https://github.com/nodejs/node/pull/38172.
8+
9+
Fix upstreamed at https://github.com/nodejs/node/pull/38686.
10+
11+
diff --git a/src/cares_wrap.h b/src/cares_wrap.h
12+
index bceafcb8b7f46b8044c69716e7241d2fa065ee5c..20d350a76321e8414508083c2037ad8c238c940b 100644
13+
--- a/src/cares_wrap.h
14+
+++ b/src/cares_wrap.h
15+
@@ -141,8 +141,8 @@ struct NodeAresTask final : public MemoryRetainer {
16+
uv_poll_t poll_watcher;
17+
18+
inline void MemoryInfo(MemoryTracker* trakcer) const override;
19+
- SET_MEMORY_INFO_NAME(NodeAresTask);
20+
- SET_SELF_SIZE(NodeAresTask);
21+
+ SET_MEMORY_INFO_NAME(NodeAresTask)
22+
+ SET_SELF_SIZE(NodeAresTask)
23+
24+
struct Hash {
25+
inline size_t operator()(NodeAresTask* a) const {
26+
diff --git a/src/timer_wrap.h b/src/timer_wrap.h
27+
index b2c20bf24d8746b5bc33ac2e55f20cd303dff269..dbc23b442bea39d4556a21bb7f365dd68239095d 100644
28+
--- a/src/timer_wrap.h
29+
+++ b/src/timer_wrap.h
30+
@@ -32,7 +32,7 @@ class TimerWrap final : public MemoryRetainer {
31+
void Ref();
32+
void Unref();
33+
34+
- SET_NO_MEMORY_INFO();
35+
+ SET_NO_MEMORY_INFO()
36+
SET_MEMORY_INFO_NAME(TimerWrap)
37+
SET_SELF_SIZE(TimerWrap)
38+

0 commit comments

Comments
 (0)