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

Merge pull request #7376 from joshuastray/v3 

use CC_CONSTRUCTOR_ACCESS to replace protected/private
This commit is contained in:
minggo 2014-07-10 14:14:08 +08:00
parent cdc02aea7c 6b22870e27
commit 0ba3f6c1c9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos/2d/CCActionInterval.h
View File

@ -585,7 +585,7 @@ public:
virtual JumpTo* clone() const override; virtual JumpTo* clone() const override;
virtual JumpTo* reverse(void) const override; virtual JumpTo* reverse(void) const override;
private: CC_CONSTRUCTOR_ACCESS:
JumpTo() {} JumpTo() {}
virtual ~JumpTo() {} virtual ~JumpTo() {}
CC_DISALLOW_COPY_AND_ASSIGN(JumpTo); CC_DISALLOW_COPY_AND_ASSIGN(JumpTo);
@ -750,7 +750,7 @@ public:
virtual ScaleBy* clone() const override; virtual ScaleBy* clone() const override;
virtual ScaleBy* reverse(void) const override; virtual ScaleBy* reverse(void) const override;
protected: CC_CONSTRUCTOR_ACCESS:
ScaleBy() {} ScaleBy() {}
virtual ~ScaleBy() {} virtual ~ScaleBy() {}
@ -842,7 +842,7 @@ public:
void setReverseAction(FadeTo* ac); void setReverseAction(FadeTo* ac);
protected: CC_CONSTRUCTOR_ACCESS:
FadeIn():_reverseAction(nullptr) {} FadeIn():_reverseAction(nullptr) {}
virtual ~FadeIn() {} virtual ~FadeIn() {}
@ -869,7 +869,7 @@ public:
void setReverseAction(FadeTo* ac); void setReverseAction(FadeTo* ac);
protected: CC_CONSTRUCTOR_ACCESS:
FadeOut():_reverseAction(nullptr) {} FadeOut():_reverseAction(nullptr) {}
virtual ~FadeOut() {} virtual ~FadeOut() {}
private: private:
@ -961,7 +961,7 @@ public:
virtual DelayTime* reverse() const override; virtual DelayTime* reverse() const override;
virtual DelayTime* clone() const override; virtual DelayTime* clone() const override;
protected: CC_CONSTRUCTOR_ACCESS:
DelayTime() {} DelayTime() {}
virtual ~DelayTime() {} virtual ~DelayTime() {}