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

Merge pull request #14086 from CocosRobot/update_lua_bindings_1444275958 

[ci skip][AUTO]: updating luabinding & jsbinding automatically
This commit is contained in:
pandamicro 2015-10-08 11:51:04 +08:00
parent 2d73bbd9d4 1919d1a679
commit f730a38db6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
View File

@ -3077,7 +3077,7 @@ bool js_cocos2dx_Node_getName(JSContext *cx, uint32_t argc, jsval *vp)
cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL);
JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_getName : Invalid Native Object"); JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_getName : Invalid Native Object");
if (argc == 0) { if (argc == 0) {
std::string ret = cobj->getName(); const std::string& ret = cobj->getName();
jsval jsret = JSVAL_NULL; jsval jsret = JSVAL_NULL;
jsret = std_string_to_jsval(cx, ret); jsret = std_string_to_jsval(cx, ret);
args.rval().set(jsret); args.rval().set(jsret);

2
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

@ -5714,7 +5714,7 @@ int lua_cocos2dx_Node_getName(lua_State* tolua_S)
tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_getName'", nullptr); tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Node_getName'", nullptr);
return 0; return 0;
} }
std::string ret = cobj->getName(); const std::string& ret = cobj->getName();
tolua_pushcppstring(tolua_S,ret); tolua_pushcppstring(tolua_S,ret);
return 1; return 1;
} }