commit bf58b98950f4248f819bf3b2eaaf04b8663f4504
author Takuto Ikuta <tikuta@google.com> Wed Apr 25 22:57:42 2018 +0900
committer Takuto Ikuta <tikuta@google.com> Wed Apr 25 14:14:03 2018 +0000
tree 0506a43e2b3d797bc9d7b9f1c03e8be074713f0f
parent d87b3a855868f10edd44a3961a5c4644c141ea69

Use override for overridden function

Bug: chromium:428099
Change-Id: Ib070a540a3ef245e2828b277dcdabd5b973322f0
Reviewed-on: https://swiftshader-review.googlesource.com/18688
Tested-by: Takuto Ikuta <tikuta@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/OpenGL/compiler/intermediate.h

diff --git a/src/OpenGL/compiler/intermediate.h b/src/OpenGL/compiler/intermediate.h
index d277255..59ac2a8 100644
--- a/src/OpenGL/compiler/intermediate.h
+++ b/src/OpenGL/compiler/intermediate.h
@@ -477,8 +477,8 @@
 public:
 	TIntermBinary(TOperator o) : TIntermOperator(o) {}
 
-	virtual TIntermBinary* getAsBinaryNode() { return this; }
-	virtual void traverse(TIntermTraverser*);
+	TIntermBinary* getAsBinaryNode() override { return this; }
+	void traverse(TIntermTraverser*) override;
 
 	void setType(const TType &t) override
 	{
@@ -519,8 +519,8 @@
 		}
 	}
 
-	virtual void traverse(TIntermTraverser*);
-	virtual TIntermUnary* getAsUnaryNode() { return this; }
+	void traverse(TIntermTraverser*) override;
+	TIntermUnary* getAsUnaryNode() override { return this; }
 
 	void setOperand(TIntermTyped* o) { operand = o; }
 	TIntermTyped* getOperand() { return operand; }
@@ -542,8 +542,8 @@
 	TIntermAggregate(TOperator o) : TIntermOperator(o), userDefined(false) { endLine = { 0, 0, 0, 0 }; }
 	~TIntermAggregate() { }
 
-	virtual TIntermAggregate* getAsAggregate() { return this; }
-	virtual void traverse(TIntermTraverser*);
+	TIntermAggregate* getAsAggregate() override { return this; }
+	void traverse(TIntermTraverser*) override;
 
 	TIntermSequence& getSequence() { return sequence; }
 

src/OpenGL/libGLESv2/Texture.h

diff --git a/src/OpenGL/libGLESv2/Texture.h b/src/OpenGL/libGLESv2/Texture.h
index 54ca5f9..52e2fb2 100644
--- a/src/OpenGL/libGLESv2/Texture.h
+++ b/src/OpenGL/libGLESv2/Texture.h
@@ -291,7 +291,7 @@
 	void subImage(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const gl::PixelStorageModes &unpackParameters, const void *pixels);
 	void subImageCompressed(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *pixels);
 	void copyImage(GLint level, GLenum internalformat, GLint x, GLint y, GLint z, GLsizei width, GLsizei height, GLsizei depth, Renderbuffer *source);
-	void copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height, Renderbuffer *source);
+	void copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height, Renderbuffer *source) override;
 
 	void setSharedImage(egl::Image *image);