Fix compile warning
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x