compiles on Xcode 7

dabingnn · Aug 7, 2015 · b65c4da · b65c4da
1 parent ec0d663
commit b65c4da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cocos/editor-support/spine/SkeletonRenderer.h b/cocos/editor-support/spine/SkeletonRenderer.h
@@ -92,10 +92,10 @@ class SkeletonRenderer: public cocos2d::Node, public cocos2d::BlendProtocol {
 	bool setAttachment (const std::string& slotName, const char* attachmentName);
 
 	// --- BlendProtocol
-	virtual void setBlendFunc (const cocos2d::BlendFunc& blendFunc);
-	virtual const cocos2d::BlendFunc& getBlendFunc () const;
-	virtual void setOpacityModifyRGB (bool value);
-	virtual bool isOpacityModifyRGB () const;
+    virtual void setBlendFunc (const cocos2d::BlendFunc& blendFunc) override;
+    virtual const cocos2d::BlendFunc& getBlendFunc () const override;
+	virtual void setOpacityModifyRGB (bool value) override;
+	virtual bool isOpacityModifyRGB () const override;
 
 CC_CONSTRUCTOR_ACCESS:
 	SkeletonRenderer ();

diff --git a/cocos/network/CCDownloaderImpl.h b/cocos/network/CCDownloaderImpl.h
@@ -47,7 +47,7 @@ namespace network
         DownloaderImpl();
         virtual ~DownloaderImpl();
 
-        bool init(const std::string& url);
+        bool init(const std::string& url) override;
 
         // Overrides
         int performDownload(DownloadUnit* unit,