Merge pull request #447 from zilongshanren/fix-warnings

add override keyword to remove warnings.
This commit is contained in:
Nathan Sweet 2015-08-06 13:16:16 +02:00
commit 56bee5ccd2

View File

@ -91,11 +91,11 @@ public:
/* @param attachmentName May be 0 for no attachment. */ /* @param attachmentName May be 0 for no attachment. */
bool setAttachment (const std::string& slotName, const char* attachmentName); bool setAttachment (const std::string& slotName, const char* attachmentName);
// --- BlendProtocol // --- BlendProtocol
virtual void setBlendFunc (const cocos2d::BlendFunc& blendFunc); virtual void setBlendFunc (const cocos2d::BlendFunc& blendFunc)override;
virtual const cocos2d::BlendFunc& getBlendFunc () const; virtual const cocos2d::BlendFunc& getBlendFunc () const override;
virtual void setOpacityModifyRGB (bool value); virtual void setOpacityModifyRGB (bool value) override;
virtual bool isOpacityModifyRGB () const; virtual bool isOpacityModifyRGB () const override;
CC_CONSTRUCTOR_ACCESS: CC_CONSTRUCTOR_ACCESS:
SkeletonRenderer (); SkeletonRenderer ();