Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13961 from zilongshanren/fix-xcode7-override-issue 

fix missing override keyword
This commit is contained in:
子龙山人 2015-09-21 11:34:43 +08:00
parent 6ab7f3804e 511b58a3b2
commit aa6d5e1a04
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/physics/CCPhysicsBody.h
View File

@ -490,7 +490,7 @@ protected:
PhysicsBody(); PhysicsBody();
virtual ~PhysicsBody(); virtual ~PhysicsBody();
virtual bool init(); virtual bool init()override;
virtual void setPosition(float positionX, float positionY); virtual void setPosition(float positionX, float positionY);
@ -498,7 +498,7 @@ protected:
virtual void setScale(float scaleX, float scaleY); virtual void setScale(float scaleX, float scaleY);
void update(float delta); void update(float delta)override;
void removeJoint(PhysicsJoint* joint); void removeJoint(PhysicsJoint* joint);