Bug 1140804 follow-up: Use final and override instead of the macros which don't exist any more
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 24 Mar 2015 14:12:17 -0400
changeset 265699 828959dd93fbd97846d6ae4afb962d399413dabc
parent 265698 7be28b1e114c9c2443cd0a1611a49d90374d28f2
child 265700 515084cb28c0cb0131f02e30b052e5ebb4b3ab13
child 265741 a5cee922ae79418797a6e7f3ab19b0f9e19e85fe
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1140804
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1140804 follow-up: Use final and override instead of the macros which don't exist any more Landed on a CLOSED TREE to fix bustage.
dom/base/WebSocket.cpp
--- a/dom/base/WebSocket.cpp
+++ b/dom/base/WebSocket.cpp
@@ -412,27 +412,27 @@ private:
   // A raw pointer because this runnable is sync.
   WebSocketImpl* mImpl;
 
   uint16_t mReasonCode;
   const nsACString& mReasonString;
   nsresult mRv;
 };
 
-class CancelWebSocketRunnable MOZ_FINAL : public nsRunnable
+class CancelWebSocketRunnable final : public nsRunnable
 {
 public:
   CancelWebSocketRunnable(nsIWebSocketChannel* aChannel, uint16_t aReasonCode,
                           const nsACString& aReasonString)
     : mChannel(aChannel)
     , mReasonCode(aReasonCode)
     , mReasonString(aReasonString)
   {}
 
-  NS_IMETHOD Run() MOZ_OVERRIDE
+  NS_IMETHOD Run() override
   {
     mChannel->Close(mReasonCode, mReasonString);
     return NS_OK;
   }
 
 private:
   nsCOMPtr<nsIWebSocketChannel> mChannel;
   uint16_t mReasonCode;