diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2016-09-22 10:36:13 +0200 |
|---|---|---|
| committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2016-09-24 21:01:49 +0200 |
| commit | 6be43a9bade4b4139c2cd06952e7567bb1f741a5 (patch) | |
| tree | 44070af7add7d4c8d9fe789b4b7140424a5ca0d5 /src/handle_wrap.h | |
| parent | 7458fbb0c7187f103d04388df2403d1ad2d72d03 (diff) | |
| download | node-new-6be43a9bade4b4139c2cd06952e7567bb1f741a5.tar.gz | |
src: rename handle__ to handle_ in HandleWrap
Commit 46633934fed7dfce289298cf16ea0f4161b77bb7 (src: pull
OnConnection from pipe_wrap and tcp_wrap) removed the private handle_
member from TCPWrap which should allow us to rename the private
handle__ member in HandleWrap.
PR-URL: https://github.com/nodejs/node/pull/8712
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ilkka Myller <ilkka.myller@nodefield.com>
Diffstat (limited to 'src/handle_wrap.h')
| -rw-r--r-- | src/handle_wrap.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/handle_wrap.h b/src/handle_wrap.h index 60f30fbd10..2a128dd8b1 100644 --- a/src/handle_wrap.h +++ b/src/handle_wrap.h @@ -47,7 +47,7 @@ class HandleWrap : public AsyncWrap { return IsAlive(wrap) && uv_has_ref(wrap->GetHandle()); } - inline uv_handle_t* GetHandle() const { return handle__; } + inline uv_handle_t* GetHandle() const { return handle_; } protected: HandleWrap(Environment* env, @@ -63,9 +63,7 @@ class HandleWrap : public AsyncWrap { static void OnClose(uv_handle_t* handle); ListNode<HandleWrap> handle_wrap_queue_; enum { kInitialized, kClosing, kClosingWithCallback, kClosed } state_; - // Using double underscore due to handle_ member in tcp_wrap. Probably - // tcp_wrap should rename it's member to 'handle'. - uv_handle_t* const handle__; + uv_handle_t* const handle_; }; |