issue #4660: Warning fix in CCLabel.cpp and ConvertUTF.c

This commit is contained in:
James Chen 2014-05-11 11:24:01 +08:00
parent 945ad2eb04
commit 3d22c30933
2 changed files with 3 additions and 1 deletions

View File

@ -1193,7 +1193,7 @@ void Label::computeStringNumLines()
int Label::getStringLength() const
{
return _currentUTF16String.length();
return static_cast<int>(_currentUTF16String.length());
}
// RGBA protocol

View File

@ -52,6 +52,8 @@
#include <stdio.h>
#endif
#include <string.h>
static const int halfShift = 10; /* used for shifting by 10 bits */
static const UTF32 halfBase = 0x0010000UL;