src: remove unnecessary template parameter

trevnorris · trevnorris · commit add955e6b831 · 2014-12-05T04:55:26.000-08:00
The template class information is received via the type of the first argument. So there is no need to use Wrap<T>(handle). PR-URL: nodejs/node-v0.x-archive#8110 Signed-off-by: Trevor Norris <trev.norris@gmail.com> Reviewed-by: Fedor Indutny <fedor@indutny.com> Reviewed-by: Alexis Campailla <alexis@janeasystems.com> Reviewed-by: Julien Gilli <julien.gilli@joyent.com>
diff --git a/src/base-object-inl.h b/src/base-object-inl.h
@@ -72,7 +72,7 @@ inline void BaseObject::MakeWeak(Type* ptr) {
   v8::HandleScope scope(env_->isolate());
   v8::Local<v8::Object> handle = object();
   assert(handle->InternalFieldCount() > 0);
-  Wrap<Type>(handle, ptr);
+  Wrap(handle, ptr);
   handle_.MarkIndependent();
   handle_.SetWeak<Type>(ptr, WeakCallback<Type>);
 }
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
@@ -74,7 +74,7 @@ class GetAddrInfoReqWrap : public ReqWrap<uv_getaddrinfo_t> {
 GetAddrInfoReqWrap::GetAddrInfoReqWrap(Environment* env,
                                        Local<Object> req_wrap_obj)
     : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_GETADDRINFOREQWRAP) {
-  Wrap<GetAddrInfoReqWrap>(req_wrap_obj, this);
+  Wrap(req_wrap_obj, this);
 }
 
 
@@ -91,7 +91,7 @@ class GetNameInfoReqWrap : public ReqWrap<uv_getnameinfo_t> {
 GetNameInfoReqWrap::GetNameInfoReqWrap(Environment* env,
                                        Local<Object> req_wrap_obj)
     : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_GETNAMEINFOREQWRAP) {
-  Wrap<GetNameInfoReqWrap>(req_wrap_obj, this);
+  Wrap(req_wrap_obj, this);
 }
 
 
diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc
@@ -96,7 +96,7 @@ HandleWrap::HandleWrap(Environment* env,
       handle__(handle) {
   handle__->data = this;
   HandleScope scope(env->isolate());
-  Wrap<HandleWrap>(object, this);
+  Wrap(object, this);
   QUEUE_INSERT_TAIL(env->handle_wrap_queue(), &handle_wrap_queue_);
 }
 
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
@@ -205,7 +205,7 @@ class ContextifyContext {
     if (wrapper.IsEmpty())
       return scope.Escape(Local<Value>::New(env->isolate(), Handle<Value>()));
 
-    Wrap<ContextifyContext>(wrapper, this);
+    Wrap(wrapper, this);
     return scope.Escape(wrapper);
   }
 
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -79,7 +79,7 @@ class FSReqWrap: public ReqWrap<uv_fs_t> {
       syscall_(syscall),
       data_(data),
       dest_len_(0) {
-    Wrap<FSReqWrap>(object(), this);
+    Wrap(object(), this);
   }
 
   void ReleaseEarly() {
diff --git a/src/pipe_wrap.cc b/src/pipe_wrap.cc
@@ -60,7 +60,7 @@ class PipeConnectWrap : public ReqWrap<uv_connect_t> {
 
 PipeConnectWrap::PipeConnectWrap(Environment* env, Local<Object> req_wrap_obj)
     : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_PIPEWRAP) {
-  Wrap<PipeConnectWrap>(req_wrap_obj, this);
+  Wrap(req_wrap_obj, this);
 }
 
 
diff --git a/src/stream_wrap.h b/src/stream_wrap.h
@@ -37,7 +37,7 @@ class ShutdownWrap : public ReqWrap<uv_shutdown_t> {
  public:
   ShutdownWrap(Environment* env, v8::Local<v8::Object> req_wrap_obj)
       : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_SHUTDOWNWRAP) {
-    Wrap<ShutdownWrap>(req_wrap_obj, this);
+    Wrap(req_wrap_obj, this);
   }
 
   static void NewShutdownWrap(const v8::FunctionCallbackInfo<v8::Value>& args) {
@@ -52,7 +52,7 @@ class WriteWrap: public ReqWrap<uv_write_t> {
   WriteWrap(Environment* env, v8::Local<v8::Object> obj, StreamWrap* wrap)
       : ReqWrap(env, obj, AsyncWrap::PROVIDER_WRITEWRAP),
         wrap_(wrap) {
-    Wrap<WriteWrap>(obj, this);
+    Wrap(obj, this);
   }
 
   void* operator new(size_t size, char* storage) { return storage; }
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
@@ -61,7 +61,7 @@ class TCPConnectWrap : public ReqWrap<uv_connect_t> {
 
 TCPConnectWrap::TCPConnectWrap(Environment* env, Local<Object> req_wrap_obj)
     : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_TCPWRAP) {
-  Wrap<TCPConnectWrap>(req_wrap_obj, this);
+  Wrap(req_wrap_obj, this);
 }
 
 
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
@@ -78,7 +78,7 @@ TLSCallbacks::TLSCallbacks(Environment* env,
       error_(NULL),
       cycle_depth_(0),
       eof_(false) {
-  node::Wrap<TLSCallbacks>(object(), this);
+  node::Wrap(object(), this);
   MakeWeak(this);
 
   // Initialize queue for clearIn writes
diff --git a/src/udp_wrap.cc b/src/udp_wrap.cc
@@ -64,7 +64,7 @@ SendWrap::SendWrap(Environment* env,
                    bool have_callback)
     : ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_UDPWRAP),
       have_callback_(have_callback) {
-  Wrap<SendWrap>(req_wrap_obj, this);
+  Wrap(req_wrap_obj, this);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ inline void BaseObject::MakeWeak(Type* ptr) {`
`72`	`72`	`v8::HandleScope scope(env_->isolate());`
`73`	`73`	`v8::Local<v8::Object> handle = object();`
`74`	`74`	`assert(handle->InternalFieldCount() > 0);`
`75`		`- Wrap<Type>(handle, ptr);`
	`75`	`+ Wrap(handle, ptr);`
`76`	`76`	`handle_.MarkIndependent();`
`77`	`77`	`handle_.SetWeak<Type>(ptr, WeakCallback<Type>);`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class GetAddrInfoReqWrap : public ReqWrap<uv_getaddrinfo_t> {`
`74`	`74`	`GetAddrInfoReqWrap::GetAddrInfoReqWrap(Environment* env,`
`75`	`75`	`Local<Object> req_wrap_obj)`
`76`	`76`	`: ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_GETADDRINFOREQWRAP) {`
`77`		`- Wrap<GetAddrInfoReqWrap>(req_wrap_obj, this);`
	`77`	`+ Wrap(req_wrap_obj, this);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`
`@@ -91,7 +91,7 @@ class GetNameInfoReqWrap : public ReqWrap<uv_getnameinfo_t> {`
`91`	`91`	`GetNameInfoReqWrap::GetNameInfoReqWrap(Environment* env,`
`92`	`92`	`Local<Object> req_wrap_obj)`
`93`	`93`	`: ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_GETNAMEINFOREQWRAP) {`
`94`		`- Wrap<GetNameInfoReqWrap>(req_wrap_obj, this);`
	`94`	`+ Wrap(req_wrap_obj, this);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ HandleWrap::HandleWrap(Environment* env,`
`96`	`96`	`handle__(handle) {`
`97`	`97`	`handle__->data = this;`
`98`	`98`	`HandleScope scope(env->isolate());`
`99`		`- Wrap<HandleWrap>(object, this);`
	`99`	`+ Wrap(object, this);`
`100`	`100`	`QUEUE_INSERT_TAIL(env->handle_wrap_queue(), &handle_wrap_queue_);`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ class ContextifyContext {`
`205`	`205`	`if (wrapper.IsEmpty())`
`206`	`206`	`return scope.Escape(Local<Value>::New(env->isolate(), Handle<Value>()));`
`207`	`207`
`208`		`- Wrap<ContextifyContext>(wrapper, this);`
	`208`	`+ Wrap(wrapper, this);`
`209`	`209`	`return scope.Escape(wrapper);`
`210`	`210`	`}`
`211`	`211`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class FSReqWrap: public ReqWrap<uv_fs_t> {`
`79`	`79`	`syscall_(syscall),`
`80`	`80`	`data_(data),`
`81`	`81`	`dest_len_(0) {`
`82`		`- Wrap<FSReqWrap>(object(), this);`
	`82`	`+ Wrap(object(), this);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`void ReleaseEarly() {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class PipeConnectWrap : public ReqWrap<uv_connect_t> {`
`60`	`60`
`61`	`61`	`PipeConnectWrap::PipeConnectWrap(Environment* env, Local<Object> req_wrap_obj)`
`62`	`62`	`: ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_PIPEWRAP) {`
`63`		`- Wrap<PipeConnectWrap>(req_wrap_obj, this);`
	`63`	`+ Wrap(req_wrap_obj, this);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class TCPConnectWrap : public ReqWrap<uv_connect_t> {`
`61`	`61`
`62`	`62`	`TCPConnectWrap::TCPConnectWrap(Environment* env, Local<Object> req_wrap_obj)`
`63`	`63`	`: ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_TCPWRAP) {`
`64`		`- Wrap<TCPConnectWrap>(req_wrap_obj, this);`
	`64`	`+ Wrap(req_wrap_obj, this);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ SendWrap::SendWrap(Environment* env,`
`64`	`64`	`bool have_callback)`
`65`	`65`	`: ReqWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_UDPWRAP),`
`66`	`66`	`have_callback_(have_callback) {`
`67`		`- Wrap<SendWrap>(req_wrap_obj, this);`
	`67`	`+ Wrap(req_wrap_obj, this);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`