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

Merge pull request #2120 from dumganhar/master 

fixed #1811: Fixing complication error on win32 after this pull request (https://github.com/cocos2d/cocos2d-x/pull/2119
This commit is contained in:
James Chen 2013-03-07 23:18:53 -08:00
parent 40fdcf82fa 91e3570ec4
commit f98d4518d0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripting/javascript/bindings/ScriptingCore.h
View File

@ -294,6 +294,10 @@ public:
operator char*() { operator char*() {
return (char*)buffer; return (char*)buffer;
} }
private:
/* Copy and assignment are not supported. */
JSStringWrapper(const JSStringWrapper &another);
JSStringWrapper &operator=(const JSStringWrapper &another);
}; };
JSBool jsb_set_reserved_slot(JSObject *obj, uint32_t idx, jsval value); JSBool jsb_set_reserved_slot(JSObject *obj, uint32_t idx, jsval value);

7
scripting/javascript/bindings/js_bindings_core.cpp
View File

@ -80,8 +80,11 @@ JSBool JSBCore_log(JSContext *cx, uint32_t argc, jsval *vp)
JSString *string = NULL; JSString *string = NULL;
JS_ConvertArguments(cx, argc, JS_ARGV(cx, vp), "S", &string); JS_ConvertArguments(cx, argc, JS_ARGV(cx, vp), "S", &string);
if (string) { if (string) {
JSAutoByteString log_str(cx, string); char* log_str = JS_EncodeString(cx, string);
CCLOG(log_str.ptr()); if (log_str) {
CCLOG(log_str);
JS_free(cx, (void*)log_str);
}
} }
return JS_TRUE; return JS_TRUE;