Bug 1119265 - Mark virtual overridden functions as MOZ_OVERRIDE in JS IPC; r=billm
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 08 Jan 2015 10:16:38 -0500
changeset 248680 afaab9b353b741c1e5e904d5e3a3806fbf0dc2af
parent 248679 d9306cec6ff8bba45b7584d5580819d3f5043949
child 248681 d644eb88d7b4b687bf060ca134ee1e66f41b9521
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbillm
bugs1119265
milestone37.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 1119265 - Mark virtual overridden functions as MOZ_OVERRIDE in JS IPC; r=billm
js/ipc/JavaScriptChild.h
js/ipc/JavaScriptParent.h
--- a/js/ipc/JavaScriptChild.h
+++ b/js/ipc/JavaScriptChild.h
@@ -21,17 +21,17 @@ class JavaScriptChild : public JavaScrip
     virtual ~JavaScriptChild();
 
     bool init();
     void updateWeakPointers();
 
     void drop(JSObject *obj);
 
   protected:
-    virtual bool isParent() { return false; }
+    virtual bool isParent() MOZ_OVERRIDE { return false; }
     virtual JSObject *scopeForTargetObjects() MOZ_OVERRIDE;
 
   private:
     bool fail(JSContext *cx, ReturnStatus *rs);
     bool ok(ReturnStatus *rs);
 };
 
 } // mozilla
--- a/js/ipc/JavaScriptParent.h
+++ b/js/ipc/JavaScriptParent.h
@@ -24,17 +24,17 @@ class JavaScriptParent : public JavaScri
     void trace(JSTracer *trc);
 
     void drop(JSObject *obj);
 
     mozilla::ipc::IProtocol*
     CloneProtocol(Channel* aChannel, ProtocolCloneContext* aCtx) MOZ_OVERRIDE;
 
   protected:
-    virtual bool isParent() { return true; }
+    virtual bool isParent() MOZ_OVERRIDE { return true; }
     virtual JSObject *scopeForTargetObjects() MOZ_OVERRIDE;
 };
 
 } // jsipc
 } // mozilla
 
 #endif // mozilla_jsipc_JavaScriptWrapper_h__