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

Merge pull request #4039 from dumganhar/spv25 

issue #2826: Bug fix of 'js::IsInRequest'
This commit is contained in:
James Chen 2013-10-31 19:56:09 -07:00
parent f684dc0ff7 0298c338a6
commit 3a8c052ae5
13 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos/scripting/javascript/bindings/ScriptingCore.cpp
View File

@ -79,15 +79,6 @@ static std::map<int,int> ports_sockets;
// name ~> globals
static std::map<std::string, js::RootedObject*> globals;
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
namespace js {
bool IsInRequest(JSContext* cx)
{
return true;
}
}
#endif
static void ReportException(JSContext *cx)
{
if (JS_IsExceptionPending(cx)) {

5
external/spidermonkey/include/android/js/RootingAPI.h vendored
View File

@ -628,11 +628,12 @@ struct GCMethods<T *>
#endif
};
#if defined(DEBUG)
// XXX: Needed for cocos2d JS Bindings
//#if defined(DEBUG)
/* This helper allows us to assert that Rooted<T> is scoped within a request. */
extern JS_PUBLIC_API(bool)
IsInRequest(JSContext *cx);
#endif
//#endif
} /* namespace js */

5
external/spidermonkey/include/ios/js/RootingAPI.h vendored
View File

@ -628,11 +628,12 @@ struct GCMethods<T *>
#endif
};
#if defined(DEBUG)
// XXX: Needed for cocos2d JS Bindings
//#if defined(DEBUG)
/* This helper allows us to assert that Rooted<T> is scoped within a request. */
extern JS_PUBLIC_API(bool)
IsInRequest(JSContext *cx);
#endif
//#endif
} /* namespace js */

5
external/spidermonkey/include/mac/js/RootingAPI.h vendored
View File

@ -628,11 +628,12 @@ struct GCMethods<T *>
#endif
};
#if defined(DEBUG)
// XXX: Needed for cocos2d JS Bindings
//#if defined(DEBUG)
/* This helper allows us to assert that Rooted<T> is scoped within a request. */
extern JS_PUBLIC_API(bool)
IsInRequest(JSContext *cx);
#endif
//#endif
} /* namespace js */

5
external/spidermonkey/include/win32/js/RootingAPI.h vendored
View File

@ -628,11 +628,12 @@ struct GCMethods<T *>
#endif
};
#if defined(DEBUG)
// XXX: Needed for cocos2d JS Bindings
//#if defined(DEBUG)
/* This helper allows us to assert that Rooted<T> is scoped within a request. */
extern JS_PUBLIC_API(bool)
IsInRequest(JSContext *cx);
#endif
//#endif
} /* namespace js */

2
external/spidermonkey/prebuilt/android/armeabi-v7a/libjs_static.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
faf19f806c33a8c42138cd4ada1c76d04f9510f4
0e1091b9f67b4d348d01b69e998be70c9e0b2dad

2
external/spidermonkey/prebuilt/android/armeabi/libjs_static.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
9c5b123f113fb3b0b6846b4f1123ec5a40004944
23bfd06f14371832fa99b4efb76133ade10887ec

2
external/spidermonkey/prebuilt/android/x86/libjs_static.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
3e18fa7933f481d605147b1d46dd7afee105fa2c
1eb9de4a5ab182f329be479e736c06ac8ab83a00

2
external/spidermonkey/prebuilt/ios/libjs_static.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
62ff11f15f6f4dae163513e336bc3e4671b91a90
1267f1437ae315da4c23e0fc5e7e3f70b4b3c8e2

2
external/spidermonkey/prebuilt/mac/libjs_static.a.REMOVED.git-id vendored
View File

@ -1 +1 @@
591cdbb9304d6f7b5682542b7a50e0b5ae4d6a4d
2385a209e3aa59896599e079658d761fd2985c9a

2
external/spidermonkey/prebuilt/win32/mozjs-25.0.dll.REMOVED.git-id vendored
View File

@ -1 +1 @@
c1212ee7de1da38ee10b27e327120205ab2cac7c
66328744e55deaa5397a58a7e0a49b34a602697b

2
external/spidermonkey/prebuilt/win32/mozjs-25.0.lib.REMOVED.git-id vendored
View File

@ -1 +1 @@
5991d26d951ae7b8398cd037bb22422ec33ab949
746eb762bc48a27219221c08bd8ada90727f3921

2
tools/cocos2d-console

@ -1 +1 @@
Subproject commit 37a695d46c0a7386a261733f9f76583895681702
Subproject commit 3556d41429e487e88fbbd5222df95fdd4c2ddf7b