src: mark more destructors with override keyword

bnoordhuis · bnoordhuis · commit 8a00961b8126 · 2014-10-23T22:50:00.000+02:00
The previous commits fixed oversights in destructors that should have
been marked virtual but weren't.  This commit marks destructors from
derived classes with the override keyword.
diff --git a/src/async-wrap.h b/src/async-wrap.h
@@ -61,7 +61,7 @@ class AsyncWrap : public BaseObject {
                    v8::Handle<v8::Object> object,
                    ProviderType provider);
 
-  inline virtual ~AsyncWrap() = default;
+  inline virtual ~AsyncWrap() override = default;
 
   inline bool has_async_listener();
 
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
@@ -698,7 +698,7 @@ class ContextifyScript : public BaseObject {
   }
 
 
-  ~ContextifyScript() {
+  ~ContextifyScript() override {
     script_.Reset();
   }
 };
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -4254,7 +4254,7 @@ class PBKDF2Request : public AsyncWrap {
       FatalError("node::PBKDF2Request()", "Out of Memory");
   }
 
-  ~PBKDF2Request() {
+  ~PBKDF2Request() override {
     persistent().Reset();
   }
 
@@ -4504,7 +4504,7 @@ class RandomBytesRequest : public AsyncWrap {
       FatalError("node::RandomBytesRequest()", "Out of Memory");
   }
 
-  ~RandomBytesRequest() {
+  ~RandomBytesRequest() override {
     persistent().Reset();
   }
 
diff --git a/src/node_crypto.h b/src/node_crypto.h
@@ -71,7 +71,7 @@ class Connection;
 
 class SecureContext : public BaseObject {
  public:
-  ~SecureContext() {
+  ~SecureContext() override {
     FreeCTXMem();
   }
 
@@ -271,7 +271,7 @@ class SSLWrap {
 // assumes that any args.This() called will be the handle from Connection.
 class Connection : public SSLWrap<Connection>, public AsyncWrap {
  public:
-  ~Connection() {
+  ~Connection() override {
 #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
     sniObject_.Reset();
     sniContext_.Reset();
@@ -361,7 +361,7 @@ class Connection : public SSLWrap<Connection>, public AsyncWrap {
 
 class CipherBase : public BaseObject {
  public:
-  ~CipherBase() {
+  ~CipherBase() override {
     if (!initialised_)
       return;
     delete[] auth_tag_;
@@ -425,7 +425,7 @@ class CipherBase : public BaseObject {
 
 class Hmac : public BaseObject {
  public:
-  ~Hmac() {
+  ~Hmac() override {
     if (!initialised_)
       return;
     HMAC_CTX_cleanup(&ctx_);
@@ -458,7 +458,7 @@ class Hmac : public BaseObject {
 
 class Hash : public BaseObject {
  public:
-  ~Hash() {
+  ~Hash() override {
     if (!initialised_)
       return;
     EVP_MD_CTX_cleanup(&mdctx_);
@@ -505,7 +505,7 @@ class SignBase : public BaseObject {
         initialised_(false) {
   }
 
-  ~SignBase() {
+  ~SignBase() override {
     if (!initialised_)
       return;
     EVP_MD_CTX_cleanup(&mdctx_);
@@ -598,7 +598,7 @@ class PublicKeyCipher {
 
 class DiffieHellman : public BaseObject {
  public:
-  ~DiffieHellman() {
+  ~DiffieHellman() override {
     if (dh != nullptr) {
       DH_free(dh);
     }
@@ -644,7 +644,7 @@ class DiffieHellman : public BaseObject {
 
 class ECDH : public BaseObject {
  public:
-  ~ECDH() {
+  ~ECDH() override {
     if (key_ != nullptr)
       EC_KEY_free(key_);
     key_ = nullptr;
diff --git a/src/node_http_parser.cc b/src/node_http_parser.cc
@@ -174,7 +174,7 @@ class Parser : public BaseObject {
   }
 
 
-  ~Parser() {
+  ~Parser() override {
     ClearWrap(object());
     persistent().Reset();
   }
diff --git a/src/node_zlib.cc b/src/node_zlib.cc
@@ -93,7 +93,7 @@ class ZCtx : public AsyncWrap {
   }
 
 
-  ~ZCtx() {
+  ~ZCtx() override {
     CHECK_EQ(false, write_in_progress_ && "write in progress");
     Close();
   }
diff --git a/src/req_wrap.h b/src/req_wrap.h
@@ -45,7 +45,7 @@ class ReqWrap : public AsyncWrap {
   }
 
 
-  ~ReqWrap() {
+  ~ReqWrap() override {
     QUEUE_REMOVE(&req_wrap_queue_);
     // Assert that someone has called Dispatched()
     CHECK_EQ(req_.data, this);
diff --git a/src/string_bytes.cc b/src/string_bytes.cc
@@ -47,7 +47,7 @@ using v8::Value;
 template <typename ResourceType, typename TypeName>
 class ExternString: public ResourceType {
   public:
-    ~ExternString() {
+    ~ExternString() override {
       delete[] data_;
       int64_t change_in_bytes = -static_cast<int64_t>(length_);
       isolate()->AdjustAmountOfExternalAllocatedMemory(change_in_bytes);
diff --git a/src/tls_wrap.h b/src/tls_wrap.h
@@ -46,7 +46,7 @@ class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>,
                      public StreamWrapCallbacks,
                      public AsyncWrap {
  public:
-  ~TLSCallbacks();
+  ~TLSCallbacks() override;
 
   static void Initialize(v8::Handle<v8::Object> target,
                          v8::Handle<v8::Value> unused,

Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ class ContextifyScript : public BaseObject {`
`698`	`698`	`}`
`699`	`699`
`700`	`700`
`701`		`- ~ContextifyScript() {`
	`701`	`+ ~ContextifyScript() override {`
`702`	`702`	`script_.Reset();`
`703`	`703`	`}`
`704`	`704`	`};`
Original file line number	Diff line number	Diff line change
`@@ -4254,7 +4254,7 @@ class PBKDF2Request : public AsyncWrap {`
`4254`	`4254`	`FatalError("node::PBKDF2Request()", "Out of Memory");`
`4255`	`4255`	`}`
`4256`	`4256`
`4257`		`- ~PBKDF2Request() {`
	`4257`	`+ ~PBKDF2Request() override {`
`4258`	`4258`	`persistent().Reset();`
`4259`	`4259`	`}`
`4260`	`4260`
`@@ -4504,7 +4504,7 @@ class RandomBytesRequest : public AsyncWrap {`
`4504`	`4504`	`FatalError("node::RandomBytesRequest()", "Out of Memory");`
`4505`	`4505`	`}`
`4506`	`4506`
`4507`		`- ~RandomBytesRequest() {`
	`4507`	`+ ~RandomBytesRequest() override {`
`4508`	`4508`	`persistent().Reset();`
`4509`	`4509`	`}`
`4510`	`4510`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ class Parser : public BaseObject {`
`174`	`174`	`}`
`175`	`175`
`176`	`176`
`177`		`- ~Parser() {`
	`177`	`+ ~Parser() override {`
`178`	`178`	`ClearWrap(object());`
`179`	`179`	`persistent().Reset();`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ class ZCtx : public AsyncWrap {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`
`96`		`- ~ZCtx() {`
	`96`	`+ ~ZCtx() override {`
`97`	`97`	`CHECK_EQ(false, write_in_progress_ && "write in progress");`
`98`	`98`	`Close();`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class ReqWrap : public AsyncWrap {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`
`48`		`- ~ReqWrap() {`
	`48`	`+ ~ReqWrap() override {`
`49`	`49`	`QUEUE_REMOVE(&req_wrap_queue_);`
`50`	`50`	`// Assert that someone has called Dispatched()`
`51`	`51`	`CHECK_EQ(req_.data, this);`