From 9d7141da5cbd64e455617dd39b8059c8b89a4dfb Mon Sep 17 00:00:00 2001 From: Jeff Walden Date: Thu, 15 Dec 2011 14:32:25 -0500 Subject: [PATCH] Add MOZ_OVERRIDE to CrossOriginWrapper functions. No bug (but sort of r=luke from bug 708735 :-) ) --HG-- extra : rebase_source : d0bdbc8c031457a3a9f7f8cc82d141e0d83883f4 --- js/xpconnect/wrappers/CrossOriginWrapper.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/js/xpconnect/wrappers/CrossOriginWrapper.h b/js/xpconnect/wrappers/CrossOriginWrapper.h index 563d28f6c79..1d2bac326b9 100644 --- a/js/xpconnect/wrappers/CrossOriginWrapper.h +++ b/js/xpconnect/wrappers/CrossOriginWrapper.h @@ -40,6 +40,8 @@ #ifndef __CrossOriginWrapper_h__ #define __CrossOriginWrapper_h__ +#include "mozilla/Attributes.h" + #include "jsapi.h" #include "jswrapper.h" @@ -50,8 +52,8 @@ class NoWaiverWrapper : public js::CrossCompartmentWrapper { NoWaiverWrapper(uintN flags); virtual ~NoWaiverWrapper(); - virtual bool enter(JSContext *cx, JSObject *wrapper, jsid id, Action act, bool *bp); - virtual void leave(JSContext *cx, JSObject *wrapper); + virtual bool enter(JSContext *cx, JSObject *wrapper, jsid id, Action act, bool *bp) MOZ_OVERRIDE; + virtual void leave(JSContext *cx, JSObject *wrapper) MOZ_OVERRIDE; static NoWaiverWrapper singleton; }; @@ -62,15 +64,15 @@ class CrossOriginWrapper : public NoWaiverWrapper { virtual ~CrossOriginWrapper(); virtual bool getPropertyDescriptor(JSContext *cx, JSObject *wrapper, jsid id, - bool set, js::PropertyDescriptor *desc); + bool set, js::PropertyDescriptor *desc) MOZ_OVERRIDE; virtual bool getOwnPropertyDescriptor(JSContext *cx, JSObject *wrapper, jsid id, - bool set, js::PropertyDescriptor *desc); + bool set, js::PropertyDescriptor *desc) MOZ_OVERRIDE; virtual bool get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, - js::Value *vp); + js::Value *vp) MOZ_OVERRIDE; - virtual bool call(JSContext *cx, JSObject *wrapper, uintN argc, js::Value *vp); + virtual bool call(JSContext *cx, JSObject *wrapper, uintN argc, js::Value *vp) MOZ_OVERRIDE; virtual bool construct(JSContext *cx, JSObject *wrapper, - uintN argc, js::Value *argv, js::Value *rval); + uintN argc, js::Value *argv, js::Value *rval) MOZ_OVERRIDE; static CrossOriginWrapper singleton; };