src: remove StreamResourc::Cast()

This is not necessary since C++ already has `static_cast` as a proper way to cast inside a class hierarchy.
nodejs · addaleax · Dec 9, 2017 · Dec 9, 2017 · Dec 9, 2017 · Dec 9, 2017
commit 3e88eba95111c567f6642057e3e32c6a71930e86
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
@@ -672,8 +672,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
@@ -334,7 +334,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
@@ -521,11 +521,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;