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

Merge pull request #7379 from joshuastray/v3 

move JumoTo's copy constuctor and operator= to private
This commit is contained in:
minggo 2014-07-12 20:19:03 +08:00
parent c371eb0b9d 7396f447a4
commit cfc291e49d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/2d/CCActionInterval.h
View File

@ -80,10 +80,11 @@ public:
virtual ActionInterval* reverse() const override = 0; virtual ActionInterval* reverse() const override = 0;
virtual ActionInterval *clone() const override = 0; virtual ActionInterval *clone() const override = 0;
protected: CC_CONSTRUCTOR_ACCESS:
/** initializes the action */ /** initializes the action */
bool initWithDuration(float d); bool initWithDuration(float d);
protected:
float _elapsed; float _elapsed;
bool _firstTick; bool _firstTick;
}; };
@ -588,6 +589,8 @@ public:
CC_CONSTRUCTOR_ACCESS: CC_CONSTRUCTOR_ACCESS:
JumpTo() {} JumpTo() {}
virtual ~JumpTo() {} virtual ~JumpTo() {}
private:
CC_DISALLOW_COPY_AND_ASSIGN(JumpTo); CC_DISALLOW_COPY_AND_ASSIGN(JumpTo);
}; };