Use "override" instead of "virtual" when replacing methods.

Bug: 20306487

Change-Id: Ic83cb04cac153a7556f5d516e8f5ec88b5527b6f
(cherry picked from commit c060f1435e7b9405f3be8974417fa6f410f03753)

17 files changed, 137 insertions, 142 deletions

diff --git a/cpu_ref/rsCpuCore.h b/cpu_ref/rsCpuCore.h
index 843fa546..c350f509 100644
--- a/cpu_ref/rsCpuCore.h
+++ b/cpu_ref/rsCpuCore.h
@@ -70,14 +70,14 @@ struct MTLaunchStruct {
 
 class RsdCpuReferenceImpl : public RsdCpuReference {
 public:
-    virtual ~RsdCpuReferenceImpl();
+    ~RsdCpuReferenceImpl() override;
     RsdCpuReferenceImpl(Context *);
 
     void lockMutex();
     void unlockMutex();
 
     bool init(uint32_t version_major, uint32_t version_minor, sym_lookup_t, script_lookup_t);
-    virtual void setPriority(int32_t priority);
+    void setPriority(int32_t priority) override;
     virtual void launchThreads(WorkerCallback_t cbk, void *data);
     static void * helperThreadProc(void *vrsc);
     RsdCpuScriptImpl * setTLS(RsdCpuScriptImpl *sc);
@@ -90,13 +90,10 @@ public:
     void launchThreads(const Allocation** ains, uint32_t inLen, Allocation* aout,
                        const RsScriptCall* sc, MTLaunchStruct* mtls);
 
-    virtual CpuScript * createScript(const ScriptC *s,
-                                     char const *resName, char const *cacheDir,
-                                     uint8_t const *bitcode, size_t bitcodeSize,
-                                     uint32_t flags);
-    virtual CpuScript * createIntrinsic(const Script *s,
-                                        RsScriptIntrinsicID iid, Element *e);
-    virtual void* createScriptGroup(const ScriptGroupBase *sg);
+    CpuScript * createScript(const ScriptC *s, char const *resName, char const *cacheDir,
+                             uint8_t const *bitcode, size_t bitcodeSize, uint32_t flags) override;
+    CpuScript * createIntrinsic(const Script *s, RsScriptIntrinsicID iid, Element *e) override;
+    void* createScriptGroup(const ScriptGroupBase *sg) override;
 
     const RsdCpuReference::CpuSymbol *symLookup(const char *);
 
@@ -119,13 +116,14 @@ public:
         return mSelectRTCallback;
     }
 
-    virtual void setSetupCompilerCallback(
-            RSSetupCompilerCallback pSetupCompilerCallback) {
+#ifndef RS_COMPATIBILITY_LIB
+    void setSetupCompilerCallback(RSSetupCompilerCallback pSetupCompilerCallback) override {
         mSetupCompilerCallback = pSetupCompilerCallback;
     }
-    virtual RSSetupCompilerCallback getSetupCompilerCallback() const {
+    RSSetupCompilerCallback getSetupCompilerCallback() const override {
         return mSetupCompilerCallback;
     }
+#endif
 
     virtual void setBccPluginName(const char *name) {
         mBccPluginName.setTo(name);
@@ -133,27 +131,27 @@ public:
     virtual const char *getBccPluginName() const {
         return mBccPluginName.string();
     }
-    virtual bool getInForEach() { return mInForEach; }
+    bool getInForEach() override { return mInForEach; }
 
     // Set to true if we should embed global variable information in the code.
-    virtual void setEmbedGlobalInfo(bool v) {
+    void setEmbedGlobalInfo(bool v) override {
         mEmbedGlobalInfo = v;
     }
 
     // Returns true if we should embed global variable information in the code.
-    virtual bool getEmbedGlobalInfo() const {
+    bool getEmbedGlobalInfo() const override {
         return mEmbedGlobalInfo;
     }
 
     // Set to true if we should skip constant (immutable) global variables when
     // potentially embedding information about globals.
-    virtual void setEmbedGlobalInfoSkipConstant(bool v) {
+    void setEmbedGlobalInfoSkipConstant(bool v) override {
         mEmbedGlobalInfoSkipConstant = v;
     }
 
     // Returns true if we should skip constant (immutable) global variables when
     // potentially embedding information about globals.
-    virtual bool getEmbedGlobalInfoSkipConstant() const {
+    bool getEmbedGlobalInfoSkipConstant() const override {
         return mEmbedGlobalInfoSkipConstant;
     }
 
diff --git a/cpu_ref/rsCpuIntrinsic.h b/cpu_ref/rsCpuIntrinsic.h
index 95aaa141..0ac8e6e7 100644
--- a/cpu_ref/rsCpuIntrinsic.h
+++ b/cpu_ref/rsCpuIntrinsic.h
@@ -26,42 +26,40 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsic : public RsdCpuScriptImpl {
 public:
-    virtual void populateScript(Script *) = 0;
-
-    virtual void invokeFunction(uint32_t slot, const void * params,
-                                size_t paramLength);
-    virtual int invokeRoot();
-
-    virtual void invokeForEach(uint32_t slot,
-                               const Allocation ** ain,
-                               uint32_t inLen,
-                               Allocation * aout,
-                               const void * usr,
-                               uint32_t usrLen,
-                               const RsScriptCall *sc);
-
-    virtual void forEachKernelSetup(uint32_t slot, MTLaunchStruct * mtls);
-    virtual void invokeInit();
-    virtual void invokeFreeChildren();
-
-    virtual void preLaunch(uint32_t slot, const Allocation ** ains,
-                           uint32_t inLen, Allocation * aout, const void * usr,
-                           uint32_t usrLen, const RsScriptCall * sc);
-    virtual void postLaunch(uint32_t slot, const Allocation ** ains,
-                            uint32_t inLen, Allocation * aout,
-                            const void * usr, uint32_t usrLen,
-                            const RsScriptCall * sc);
-
-    virtual void setGlobalVar(uint32_t slot, const void * data,
-                              size_t dataLength);
-    virtual void setGlobalVarWithElemDims(uint32_t slot, const void * data,
-                                          size_t dataLength, const Element * e,
-                                          const uint32_t * dims,
-                                          size_t dimLength);
-    virtual void setGlobalBind(uint32_t slot, Allocation *data);
-    virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
-
-    virtual ~RsdCpuScriptIntrinsic();
+    void populateScript(Script *) override = 0;
+
+    void invokeFunction(uint32_t slot, const void * params, size_t paramLength) override;
+    int invokeRoot() override;
+
+    void invokeForEach(uint32_t slot,
+                       const Allocation ** ain,
+                       uint32_t inLen,
+                       Allocation * aout,
+                       const void * usr,
+                       uint32_t usrLen,
+                       const RsScriptCall *sc) override;
+
+    void forEachKernelSetup(uint32_t slot, MTLaunchStruct * mtls) override;
+    void invokeInit() override;
+    void invokeFreeChildren() override;
+
+    void preLaunch(uint32_t slot, const Allocation ** ains,
+                   uint32_t inLen, Allocation * aout, const void * usr,
+                   uint32_t usrLen, const RsScriptCall * sc) override;
+    void postLaunch(uint32_t slot, const Allocation ** ains,
+                    uint32_t inLen, Allocation * aout,
+                    const void * usr, uint32_t usrLen,
+                    const RsScriptCall * sc) override;
+
+    void setGlobalVar(uint32_t slot, const void * data, size_t dataLength) override;
+    void setGlobalVarWithElemDims(uint32_t slot, const void * data,
+                                  size_t dataLength, const Element * e,
+                                  const uint32_t * dims,
+                                  size_t dimLength) override;
+    void setGlobalBind(uint32_t slot, Allocation *data) override;
+    void setGlobalObj(uint32_t slot, ObjectBase *data) override;
+
+    ~RsdCpuScriptIntrinsic() override;
     RsdCpuScriptIntrinsic(RsdCpuReferenceImpl * ctx, const Script * s,
                           const Element * e, RsScriptIntrinsicID iid);
 
diff --git a/cpu_ref/rsCpuIntrinsic3DLUT.cpp b/cpu_ref/rsCpuIntrinsic3DLUT.cpp
index 734e5e5e..add5cd83 100644
--- a/cpu_ref/rsCpuIntrinsic3DLUT.cpp
+++ b/cpu_ref/rsCpuIntrinsic3DLUT.cpp
@@ -27,12 +27,12 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsic3DLUT : public RsdCpuScriptIntrinsic {
 public:
-    virtual void populateScript(Script *);
-    virtual void invokeFreeChildren();
+    void populateScript(Script *) override;
+    void invokeFreeChildren() override;
 
-    virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
+    void setGlobalObj(uint32_t slot, ObjectBase *data) override;
 
-    virtual ~RsdCpuScriptIntrinsic3DLUT();
+    ~RsdCpuScriptIntrinsic3DLUT() override;
     RsdCpuScriptIntrinsic3DLUT(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e);
 
 protected:
diff --git a/cpu_ref/rsCpuIntrinsicBLAS.cpp b/cpu_ref/rsCpuIntrinsicBLAS.cpp
index b4dd2a4e..30344544 100644
--- a/cpu_ref/rsCpuIntrinsicBLAS.cpp
+++ b/cpu_ref/rsCpuIntrinsicBLAS.cpp
@@ -28,16 +28,16 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsicBLAS : public RsdCpuScriptIntrinsic {
 public:
-    virtual void invokeForEach(uint32_t slot,
-                               const Allocation ** ain,
-                               uint32_t inLen,
-                               Allocation * aout,
-                               const void * usr,
-                               uint32_t usrLen,
-                               const RsScriptCall *sc);
-
-    virtual void populateScript(Script *);
-    virtual ~RsdCpuScriptIntrinsicBLAS();
+    void invokeForEach(uint32_t slot,
+                       const Allocation ** ain,
+                       uint32_t inLen,
+                       Allocation * aout,
+                       const void * usr,
+                       uint32_t usrLen,
+                       const RsScriptCall *sc) override;
+
+    void populateScript(Script *) override;
+    ~RsdCpuScriptIntrinsicBLAS() override;
     RsdCpuScriptIntrinsicBLAS(RsdCpuReferenceImpl *ctx, const Script *s);
 
 protected:
diff --git a/cpu_ref/rsCpuIntrinsicBlend.cpp b/cpu_ref/rsCpuIntrinsicBlend.cpp
index 16348c64..d546bbd3 100644
--- a/cpu_ref/rsCpuIntrinsicBlend.cpp
+++ b/cpu_ref/rsCpuIntrinsicBlend.cpp
@@ -27,9 +27,9 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsicBlend : public RsdCpuScriptIntrinsic {
 public:
-    virtual void populateScript(Script *);
+    void populateScript(Script *) override;
 
-    virtual ~RsdCpuScriptIntrinsicBlend();
+    ~RsdCpuScriptIntrinsicBlend() override;
     RsdCpuScriptIntrinsicBlend(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e);
 
 protected:
diff --git a/cpu_ref/rsCpuIntrinsicBlur.cpp b/cpu_ref/rsCpuIntrinsicBlur.cpp
index a3ed1d1c..cac10d81 100644
--- a/cpu_ref/rsCpuIntrinsicBlur.cpp
+++ b/cpu_ref/rsCpuIntrinsicBlur.cpp
@@ -26,13 +26,13 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsicBlur : public RsdCpuScriptIntrinsic {
 public:
-    virtual void populateScript(Script *);
-    virtual void invokeFreeChildren();
+    void populateScript(Script *) override;
+    void invokeFreeChildren() override;
 
-    virtual void setGlobalVar(uint32_t slot, const void *data, size_t dataLength);
-    virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
+    void setGlobalVar(uint32_t slot, const void *data, size_t dataLength) override;
+    void setGlobalObj(uint32_t slot, ObjectBase *data) override;
 
-    virtual ~RsdCpuScriptIntrinsicBlur();
+    ~RsdCpuScriptIntrinsicBlur() override;
     RsdCpuScriptIntrinsicBlur(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e);
 
 protected:
diff --git a/cpu_ref/rsCpuIntrinsicColorMatrix.cpp b/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
index a7d576bb..5638f849 100644
--- a/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
+++ b/cpu_ref/rsCpuIntrinsicColorMatrix.cpp
@@ -160,16 +160,16 @@ extern "C" void rsdIntrinsicColorMatrixSetup_float_K(
 
 class RsdCpuScriptIntrinsicColorMatrix : public RsdCpuScriptIntrinsic {
 public:
-    virtual void populateScript(Script *);
+    void populateScript(Script *) override;
 
-    virtual void setGlobalVar(uint32_t slot, const void *data, size_t dataLength);
+    void setGlobalVar(uint32_t slot, const void *data, size_t dataLength) override;
 
-    virtual ~RsdCpuScriptIntrinsicColorMatrix();
+    ~RsdCpuScriptIntrinsicColorMatrix() override;
     RsdCpuScriptIntrinsicColorMatrix(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e);
 
-    virtual void preLaunch(uint32_t slot, const Allocation ** ains,
-                           uint32_t inLen, Allocation * aout, const void * usr,
-                           uint32_t usrLen, const RsScriptCall *sc);
+    void preLaunch(uint32_t slot, const Allocation ** ains,
+                   uint32_t inLen, Allocation * aout, const void * usr,
+                   uint32_t usrLen, const RsScriptCall *sc) override;
 
 protected:
     float fp[16];
diff --git a/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp b/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp
index ce7be794..46802fc7 100644
--- a/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp
+++ b/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp
@@ -27,13 +27,13 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsicConvolve3x3 : public RsdCpuScriptIntrinsic {
 public:
-    virtual void populateScript(Script *);
-    virtual void invokeFreeChildren();
+    void populateScript(Script *) override;
+    void invokeFreeChildren() override;
 
-    virtual void setGlobalVar(uint32_t slot, const void *data, size_t dataLength);
-    virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
+    void setGlobalVar(uint32_t slot, const void *data, size_t dataLength) override;
+    void setGlobalObj(uint32_t slot, ObjectBase *data) override;
 
-    virtual ~RsdCpuScriptIntrinsicConvolve3x3();
+    ~RsdCpuScriptIntrinsicConvolve3x3() override;
     RsdCpuScriptIntrinsicConvolve3x3(RsdCpuReferenceImpl *ctx, const Script *s, const Element *);
 
 protected:
diff --git a/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp b/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
index 29dd8869..92e739fe 100644
--- a/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
+++ b/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
@@ -27,13 +27,13 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsicConvolve5x5 : public RsdCpuScriptIntrinsic {
 public:
-    virtual void populateScript(Script *);
-    virtual void invokeFreeChildren();
+    void populateScript(Script *) override;
+    void invokeFreeChildren() override;
 
-    virtual void setGlobalVar(uint32_t slot, const void *data, size_t dataLength);
-    virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
+    void setGlobalVar(uint32_t slot, const void *data, size_t dataLength) override;
+    void setGlobalObj(uint32_t slot, ObjectBase *data) override;
 
-    virtual ~RsdCpuScriptIntrinsicConvolve5x5();
+    ~RsdCpuScriptIntrinsicConvolve5x5() override;
     RsdCpuScriptIntrinsicConvolve5x5(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e);
 
 protected:
diff --git a/cpu_ref/rsCpuIntrinsicHistogram.cpp b/cpu_ref/rsCpuIntrinsicHistogram.cpp
index fd607940..88d991ba 100644
--- a/cpu_ref/rsCpuIntrinsicHistogram.cpp
+++ b/cpu_ref/rsCpuIntrinsicHistogram.cpp
@@ -26,13 +26,13 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsicHistogram : public RsdCpuScriptIntrinsic {
 public:
-    virtual void populateScript(Script *);
-    virtual void invokeFreeChildren();
+    void populateScript(Script *) override;
+    void invokeFreeChildren() override;
 
-    virtual void setGlobalVar(uint32_t slot, const void *data, size_t dataLength);
-    virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
+    void setGlobalVar(uint32_t slot, const void *data, size_t dataLength) override;
+    void setGlobalObj(uint32_t slot, ObjectBase *data) override;
 
-    virtual ~RsdCpuScriptIntrinsicHistogram();
+    ~RsdCpuScriptIntrinsicHistogram() override;
     RsdCpuScriptIntrinsicHistogram(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e);
 
 protected:
diff --git a/cpu_ref/rsCpuIntrinsicLUT.cpp b/cpu_ref/rsCpuIntrinsicLUT.cpp
index 622fe1e3..b038d94a 100644
--- a/cpu_ref/rsCpuIntrinsicLUT.cpp
+++ b/cpu_ref/rsCpuIntrinsicLUT.cpp
@@ -27,12 +27,12 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsicLUT : public RsdCpuScriptIntrinsic {
 public:
-    virtual void populateScript(Script *);
-    virtual void invokeFreeChildren();
+    void populateScript(Script *) override;
+    void invokeFreeChildren() override;
 
-    virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
+    void setGlobalObj(uint32_t slot, ObjectBase *data) override;
 
-    virtual ~RsdCpuScriptIntrinsicLUT();
+    ~RsdCpuScriptIntrinsicLUT() override;
     RsdCpuScriptIntrinsicLUT(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e);
 
 protected:
diff --git a/cpu_ref/rsCpuIntrinsicResize.cpp b/cpu_ref/rsCpuIntrinsicResize.cpp
index b4501900..8a0f0297 100644
--- a/cpu_ref/rsCpuIntrinsicResize.cpp
+++ b/cpu_ref/rsCpuIntrinsicResize.cpp
@@ -27,17 +27,17 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsicResize : public RsdCpuScriptIntrinsic {
 public:
-    virtual void populateScript(Script *);
-    virtual void invokeFreeChildren();
+    void populateScript(Script *) override;
+    void invokeFreeChildren() override;
 
-    virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
+    void setGlobalObj(uint32_t slot, ObjectBase *data) override;
 
-    virtual ~RsdCpuScriptIntrinsicResize();
+    ~RsdCpuScriptIntrinsicResize() override;
     RsdCpuScriptIntrinsicResize(RsdCpuReferenceImpl *ctx, const Script *s, const Element *);
 
-    virtual void preLaunch(uint32_t slot, const Allocation ** ains,
-                           uint32_t inLen, Allocation * aout, const void * usr,
-                           uint32_t usrLen, const RsScriptCall *sc);
+    void preLaunch(uint32_t slot, const Allocation ** ains,
+                   uint32_t inLen, Allocation * aout, const void * usr,
+                   uint32_t usrLen, const RsScriptCall *sc) override;
 
     float scaleX;
     float scaleY;
diff --git a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
index 395a158b..6155a968 100644
--- a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
+++ b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
@@ -35,12 +35,12 @@ namespace renderscript {
 
 class RsdCpuScriptIntrinsicYuvToRGB : public RsdCpuScriptIntrinsic {
 public:
-    virtual void populateScript(Script *);
-    virtual void invokeFreeChildren();
+    void populateScript(Script *) override;
+    void invokeFreeChildren() override;
 
-    virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
+    void setGlobalObj(uint32_t slot, ObjectBase *data) override;
 
-    virtual ~RsdCpuScriptIntrinsicYuvToRGB();
+    ~RsdCpuScriptIntrinsicYuvToRGB() override;
     RsdCpuScriptIntrinsicYuvToRGB(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e);
 
 protected:
diff --git a/cpu_ref/rsCpuScript.h b/cpu_ref/rsCpuScript.h
index b7e12e7f..4844b349 100644
--- a/cpu_ref/rsCpuScript.h
+++ b/cpu_ref/rsCpuScript.h
@@ -57,10 +57,10 @@ public:
     bool init(char const *resName, char const *cacheDir,
               uint8_t const *bitcode, size_t bitcodeSize, uint32_t flags,
               char const *bccPluginName = nullptr);
-    virtual void populateScript(Script *);
+    void populateScript(Script *) override;
 
-    virtual void invokeFunction(uint32_t slot, const void *params, size_t paramLength);
-    virtual int invokeRoot();
+    void invokeFunction(uint32_t slot, const void *params, size_t paramLength) override;
+    int invokeRoot() override;
     virtual void preLaunch(uint32_t slot, const Allocation ** ains,
                            uint32_t inLen, Allocation * aout, const void * usr,
                            uint32_t usrLen, const RsScriptCall *sc);
@@ -69,27 +69,28 @@ public:
                             const void * usr, uint32_t usrLen,
                             const RsScriptCall *sc);
 
-    virtual void invokeForEach(uint32_t slot,
-                               const Allocation ** ains,
-                               uint32_t inLen,
-                               Allocation* aout,
-                               const void* usr,
-                               uint32_t usrLen,
-                               const RsScriptCall* sc);
-
-    virtual void invokeInit();
-    virtual void invokeFreeChildren();
-
-    virtual void setGlobalVar(uint32_t slot, const void *data, size_t dataLength);
-    virtual void getGlobalVar(uint32_t slot, void *data, size_t dataLength);
-    virtual void setGlobalVarWithElemDims(uint32_t slot, const void *data, size_t dataLength,
-                                  const Element *e, const uint32_t *dims, size_t dimLength);
-    virtual void setGlobalBind(uint32_t slot, Allocation *data);
-    virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
+    void invokeForEach(uint32_t slot,
+                       const Allocation ** ains,
+                       uint32_t inLen,
+                       Allocation* aout,
+                       const void* usr,
+                       uint32_t usrLen,
+                       const RsScriptCall* sc) override;
+
+    void invokeInit() override;
+    void invokeFreeChildren() override;
+
+    void setGlobalVar(uint32_t slot, const void *data, size_t dataLength) override;
+    void getGlobalVar(uint32_t slot, void *data, size_t dataLength) override;
+    void setGlobalVarWithElemDims(uint32_t slot, const void *data, size_t dataLength,
+                                  const Element *e, const uint32_t *dims,
+                                  size_t dimLength) override;
+    void setGlobalBind(uint32_t slot, Allocation *data) override;
+    void setGlobalObj(uint32_t slot, ObjectBase *data) override;
 
     const char* getFieldName(uint32_t slot) const;
 
-    virtual ~RsdCpuScriptImpl();
+    ~RsdCpuScriptImpl() override;
     RsdCpuScriptImpl(RsdCpuReferenceImpl *ctx, const Script *s);
 
     const Script * getScript() {return mScript;}
@@ -104,7 +105,7 @@ public:
     const RsdCpuReference::CpuSymbol * lookupSymbolMath(const char *sym);
     static void * lookupRuntimeStub(void* pContext, char const* name);
 
-    virtual Allocation * getAllocationForPointer(const void *ptr) const;
+    Allocation * getAllocationForPointer(const void *ptr) const override;
     bool storeRSInfoFromSO();
 
     int getGlobalEntries() const override;
diff --git a/cpu_ref/rsCpuScriptGroup.h b/cpu_ref/rsCpuScriptGroup.h
index acfe754c..810488af 100644
--- a/cpu_ref/rsCpuScriptGroup.h
+++ b/cpu_ref/rsCpuScriptGroup.h
@@ -25,10 +25,10 @@ namespace renderscript {
 
 class CpuScriptGroupImpl : public RsdCpuReference::CpuScriptGroup {
 public:
-    virtual void setInput(const ScriptKernelID *kid, Allocation *);
-    virtual void setOutput(const ScriptKernelID *kid, Allocation *);
-    virtual void execute();
-    virtual ~CpuScriptGroupImpl();
+    void setInput(const ScriptKernelID *kid, Allocation *) override;
+    void setOutput(const ScriptKernelID *kid, Allocation *) override;
+    void execute() override;
+    ~CpuScriptGroupImpl() override;
 
     CpuScriptGroupImpl(RsdCpuReferenceImpl *ctx, const ScriptGroupBase *sg);
     bool init();
diff --git a/cpu_ref/rsCpuScriptGroup2.h b/cpu_ref/rsCpuScriptGroup2.h
index 1883f903..eaeeff57 100644
--- a/cpu_ref/rsCpuScriptGroup2.h
+++ b/cpu_ref/rsCpuScriptGroup2.h
@@ -60,10 +60,10 @@ public:
 class CpuScriptGroup2Impl : public RsdCpuReference::CpuScriptGroup2 {
 public:
     CpuScriptGroup2Impl(RsdCpuReferenceImpl *cpuRefImpl, const ScriptGroupBase* group);
-    virtual ~CpuScriptGroup2Impl();
+    ~CpuScriptGroup2Impl() override;
 
     bool init();
-    virtual void execute();
+    void execute() override;
 
     RsdCpuReferenceImpl* getCpuRefImpl() const { return mCpuRefImpl; }
     ScriptExecutable* getExecutable() const { return mExecutable; }
diff --git a/cpu_ref/rsd_cpu.h b/cpu_ref/rsd_cpu.h
index adca82fb..6bfd9131 100644
--- a/cpu_ref/rsd_cpu.h
+++ b/cpu_ref/rsd_cpu.h
@@ -112,14 +112,12 @@ public:
     public:
         virtual void setInput(const ScriptKernelID *kid, Allocation *) = 0;
         virtual void setOutput(const ScriptKernelID *kid, Allocation *) = 0;
-        virtual void execute() = 0;
-        virtual ~CpuScriptGroup() {};
+        ~CpuScriptGroup() override {};
     };
 
     class CpuScriptGroup2 : public CpuScriptGroupBase {
      public:
-      virtual void execute() = 0;
-      virtual ~CpuScriptGroup2() {}
+      ~CpuScriptGroup2() override {}
     };
 
     static Context * getTlsContext();