mirror of https://github.com/axmolengine/axmol.git
Merge pull request #4487 from Dhilan007/compile_error_ssize
fix compile error related to ssize_t.
This commit is contained in:
commit
df07ae609d
|
@ -533,7 +533,7 @@ JSBool ScriptingCore::runScript(const char *path, JSObject* global, JSContext* c
|
|||
|
||||
// a) check jsc file first
|
||||
std::string byteCodePath = RemoveFileExt(std::string(path)) + BYTE_CODE_FILE_EXT;
|
||||
long length = 0;
|
||||
ssize_t length = 0;
|
||||
unsigned char* data = futil->getFileData(byteCodePath.c_str(),
|
||||
"rb",
|
||||
&length);
|
||||
|
|
|
@ -1 +1 @@
|
|||
7a245db1098d7ced5947aca62f43e67f06d1492d
|
||||
6ea6ffc183c8a15eae0641c73c9886b90172266f
|
|
@ -248,7 +248,7 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
virtual Size tableCellSizeForIndex(TableView *table, long idx)
|
||||
virtual Size tableCellSizeForIndex(TableView *table, ssize_t idx)
|
||||
{
|
||||
jsval ret;
|
||||
bool ok = callJSDelegate(table, idx, "tableCellSizeForIndex", ret);
|
||||
|
@ -268,7 +268,7 @@ public:
|
|||
|
||||
}
|
||||
|
||||
virtual TableViewCell* tableCellAtIndex(TableView *table, long idx)
|
||||
virtual TableViewCell* tableCellAtIndex(TableView *table, ssize_t idx)
|
||||
{
|
||||
jsval ret;
|
||||
bool ok = callJSDelegate(table, idx, "tableCellAtIndex", ret);
|
||||
|
|
|
@ -51,7 +51,7 @@ bool TableView::initWithViewSize(Size size, Node* container/* = NULL*/)
|
|||
{
|
||||
if (ScrollView::initWithViewSize(size,container))
|
||||
{
|
||||
_indices = new std::set<long>();
|
||||
_indices = new std::set<ssize_t>();
|
||||
_vordering = VerticalFillOrder::BOTTOM_UP;
|
||||
this->setDirection(Direction::VERTICAL);
|
||||
|
||||
|
|
Loading…
Reference in New Issue