10 files changed, 12 insertions, 12 deletions

diff --git a/src/base-object-inl.h b/src/base-object-inl.h
index 17540f4822..ac9c052813 100644
--- a/src/base-object-inl.h
+++ b/src/base-object-inl.h
@@ -70,7 +70,7 @@ inline void BaseObject::MakeWeak(Type* ptr) {
   v8::HandleScope scope(env_->isolate());
   v8::Local<v8::Object> handle = object();
   CHECK_GT(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
index f9761f9605..e59d2a87f9 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -73,7 +73,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);
 }
 
 
@@ -90,7 +90,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
index 3e348a8b25..f4e34effc6 100644
--- a/src/handle_wrap.cc
+++ b/src/handle_wrap.cc
@@ -89,7 +89,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
index 23e5b99a34..ead5e3efc3 100644
--- 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
index 9f03f011c9..6aa09772bd 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -78,7 +78,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
index a46060cb8b..512b438218 100644
--- 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
index 726d7f26b7..93c9f046e0 100644
--- 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
index f17ebcef8a..9c1aeee649 100644
--- 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
index 650fa80078..3d80970422 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -75,7 +75,7 @@ TLSCallbacks::TLSCallbacks(Environment* env,
       error_(nullptr),
       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
index 9fbf391207..42b5f1f03a 100644
--- 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);
 }