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

* Fixed warnings in VS2012: C4018 (signed/unsigned mismatch) and C4244 (conversion from 'double' to 'float').

This commit is contained in:
signmotion 2013-11-23 07:23:06 +02:00
parent 4582686860
commit 0d9cd9784b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/gui/UIListView.cpp
View File

@ -301,7 +301,8 @@ void UIListView::removeLastItem()
UIWidget* UIListView::getItem(unsigned int index) UIWidget* UIListView::getItem(unsigned int index)
{ {
if ((int)index < 0 || index >= _items->count()) // @todo Signed/unsigned mishmash. Index is must be unsigned int always. Yes?
if ( ((int)index < 0) || ((int)index >= _items->count()) )
{ {
return nullptr; return nullptr;
} }

2
cocos/network/SocketIO.cpp
View File

@ -367,7 +367,7 @@ void SIOClientImpl::onOpen(WebSocket* ws)
c->onOpen(); c->onOpen();
} }
Director::getInstance()->getScheduler()->scheduleSelector(schedule_selector(SIOClientImpl::heartbeat), this, (_heartbeat * .9), false); Director::getInstance()->getScheduler()->scheduleSelector(schedule_selector(SIOClientImpl::heartbeat), this, (_heartbeat * .9f), false);
log("SIOClientImpl::onOpen socket connected!"); log("SIOClientImpl::onOpen socket connected!");
} }

2
samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp
View File

@ -519,7 +519,7 @@ void SpriteMainScene::onEnter()
auto director = Director::getInstance(); auto director = Director::getInstance();
auto sched = director->getScheduler(); auto sched = director->getScheduler();
sched->scheduleSelector(SEL_SCHEDULE(&SpriteMainScene::updateAutoTest), this, 0.2, false); sched->scheduleSelector(SEL_SCHEDULE(&SpriteMainScene::updateAutoTest), this, 0.2f, false);
} }
} }