src: remove StreamResourc::Cast()

addaleax · MylesBorins · commit 7ed9e5de3917 · 2018-01-08T02:20:05.000-05:00
This is not necessary since C++ already has `static_cast` as a proper way to cast inside a class hierarchy. PR-URL: #17564 Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/js_stream.cc b/src/js_stream.cc
@@ -74,11 +74,6 @@ void JSStream::OnReadImpl(ssize_t nread,
 }
 
 
-void* JSStream::Cast() {
-  return static_cast<void*>(this);
-}
-
-
 AsyncWrap* JSStream::GetAsyncWrap() {
   return static_cast<AsyncWrap*>(this);
 }
diff --git a/src/js_stream.h b/src/js_stream.h
@@ -18,7 +18,6 @@ class JSStream : public AsyncWrap, public StreamBase {
 
   ~JSStream();
 
-  void* Cast() override;
   bool IsAlive() override;
   bool IsClosing() override;
   int ReadStart() override;
diff --git a/src/node_http2.h b/src/node_http2.h
@@ -657,8 +657,7 @@ class Http2Stream : public AsyncWrap,
     return false;
   }
 
-  AsyncWrap* GetAsyncWrap() override { return static_cast<AsyncWrap*>(this); }
-  void* Cast() override { return reinterpret_cast<void*>(this); }
+  AsyncWrap* GetAsyncWrap() override { return this; }
 
   int DoWrite(WriteWrap* w, uv_buf_t* bufs, size_t count,
               uv_stream_t* send_handle) override;
diff --git a/src/stream_base.h b/src/stream_base.h
@@ -231,7 +231,6 @@ class StreamBase : public StreamResource {
                                 v8::Local<v8::FunctionTemplate> target,
                                 int flags = kFlagNone);
 
-  virtual void* Cast() = 0;
   virtual bool IsAlive() = 0;
   virtual bool IsClosing() = 0;
   virtual bool IsIPCPipe();
@@ -250,9 +249,6 @@ class StreamBase : public StreamResource {
     consumed_ = false;
   }
 
-  template <class Outer>
-  inline Outer* Cast() { return static_cast<Outer*>(Cast()); }
-
   void EmitData(ssize_t nread,
                 v8::Local<v8::Object> buf,
                 v8::Local<v8::Object> handle);
diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
@@ -126,11 +126,6 @@ bool LibuvStreamWrap::IsClosing() {
 }
 
 
-void* LibuvStreamWrap::Cast() {
-  return reinterpret_cast<void*>(this);
-}
-
-
 AsyncWrap* LibuvStreamWrap::GetAsyncWrap() {
   return static_cast<AsyncWrap*>(this);
 }
diff --git a/src/stream_wrap.h b/src/stream_wrap.h
@@ -40,7 +40,6 @@ class LibuvStreamWrap : public HandleWrap, public StreamBase {
                          v8::Local<v8::Context> context);
 
   int GetFD() override;
-  void* Cast() override;
   bool IsAlive() override;
   bool IsClosing() override;
   bool IsIPCPipe() override;
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
@@ -347,7 +347,7 @@ void TLSWrap::EncOut() {
 
 
 void TLSWrap::EncOutCb(WriteWrap* req_wrap, int status) {
-  TLSWrap* wrap = req_wrap->wrap()->Cast<TLSWrap>();
+  TLSWrap* wrap = static_cast<TLSWrap*>(req_wrap->wrap());
   req_wrap->Dispose();
 
   // We should not be getting here after `DestroySSL`, because all queued writes
@@ -534,11 +534,6 @@ bool TLSWrap::ClearIn() {
 }
 
 
-void* TLSWrap::Cast() {
-  return reinterpret_cast<void*>(this);
-}
-
-
 AsyncWrap* TLSWrap::GetAsyncWrap() {
   return static_cast<AsyncWrap*>(this);
 }
diff --git a/src/tls_wrap.h b/src/tls_wrap.h
@@ -56,7 +56,6 @@ class TLSWrap : public AsyncWrap,
                          v8::Local<v8::Value> unused,
                          v8::Local<v8::Context> context);
 
-  void* Cast() override;
   int GetFD() override;
   bool IsAlive() override;
   bool IsClosing() override;

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,6 @@ void JSStream::OnReadImpl(ssize_t nread,`
`74`	`74`	`}`
`75`	`75`
`76`	`76`
`77`		`-void* JSStream::Cast() {`
`78`		`- return static_cast<void*>(this);`
`79`		`-}`
`80`		`-`
`81`		`-`
`82`	`77`	`AsyncWrap* JSStream::GetAsyncWrap() {`
`83`	`78`	`return static_cast<AsyncWrap*>(this);`
`84`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -657,8 +657,7 @@ class Http2Stream : public AsyncWrap,`
`657`	`657`	`return false;`
`658`	`658`	`}`
`659`	`659`
`660`		`- AsyncWrap* GetAsyncWrap() override { return static_cast<AsyncWrap*>(this); }`
`661`		`- void* Cast() override { return reinterpret_cast<void*>(this); }`
	`660`	`+ AsyncWrap* GetAsyncWrap() override { return this; }`
`662`	`661`
`663`	`662`	`int DoWrite(WriteWrap* w, uv_buf_t* bufs, size_t count,`
`664`	`663`	`uv_stream_t* send_handle) override;`
Original file line number	Diff line number	Diff line change
`@@ -126,11 +126,6 @@ bool LibuvStreamWrap::IsClosing() {`
`126`	`126`	`}`
`127`	`127`
`128`	`128`
`129`		`-void* LibuvStreamWrap::Cast() {`
`130`		`- return reinterpret_cast<void*>(this);`
`131`		`-}`
`132`		`-`
`133`		`-`
`134`	`129`	`AsyncWrap* LibuvStreamWrap::GetAsyncWrap() {`
`135`	`130`	`return static_cast<AsyncWrap*>(this);`
`136`	`131`	`}`