diff options
author | Chad Austin <chad@imvu.com> | 2013-02-01 17:15:19 -0800 |
---|---|---|
committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-04-12 14:23:52 +0300 |
commit | 70aebcde9e97a9befdb7b912d0a3c1f3b5b9a003 (patch) | |
tree | 2c0cf4982f29fcfd25d4aec11f803f402127c869 /system/lib | |
parent | 4fa56f796784b44a2b70aa69c5c9de012634ecd4 (diff) |
EMSCRIPTEN_KEEPALIVE has been removed
Diffstat (limited to 'system/lib')
-rwxr-xr-x | system/lib/embind/bind.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/lib/embind/bind.cpp b/system/lib/embind/bind.cpp index 5e82bb7e..cbb4b183 100755 --- a/system/lib/embind/bind.cpp +++ b/system/lib/embind/bind.cpp @@ -138,7 +138,7 @@ namespace emscripten { return derivationPath;
}
- void* EMSCRIPTEN_KEEPALIVE __staticPointerCast(void* p, int from, int to) {
+ void* __staticPointerCast(void* p, int from, int to) {
std::vector<std::vector<const __cxxabiv1::__class_type_info*>> paths;
int direction = 1;
@@ -176,7 +176,7 @@ namespace emscripten { // __getDynamicPointerType returns (for polymorphic types only!) the type of the instance actually
// pointed to.
- int EMSCRIPTEN_KEEPALIVE __getDynamicPointerType(int p) {
+ int __getDynamicPointerType(int p) {
void** vtable = *(void***)p;
return (int)static_cast<const std::type_info*>(vtable[-1]);
}
@@ -189,7 +189,7 @@ namespace emscripten { // __dynamicPointerCast performs a C++ dynamic_cast<>() operation, but allowing run-time specification of
// the from and to pointer types.
- int EMSCRIPTEN_KEEPALIVE __dynamicPointerCast(int p, int to) {
+ int __dynamicPointerCast(int p, int to) {
int ret = (int)__staticPointerCast((void *)p, __getDynamicPointerType(p), to);
if (ret < 0) {
return 0;
@@ -197,7 +197,7 @@ namespace emscripten { return ret;
}
- const char* EMSCRIPTEN_KEEPALIVE __typeName(int p) {
+ const char* __typeName(int p) {
const std::type_info* ti = (const std::type_info*)p;
size_t nameLen = std::min(strlen(ti->name()), (unsigned int)1024);
char* name = (char *)malloc(nameLen+1);
@@ -221,7 +221,7 @@ namespace emscripten { return bases;
}
- int EMSCRIPTEN_KEEPALIVE __peek32(int p) {
+ int __peek32(int p) {
return *(int *)p;
}
|