diff options
author | Bill Welden <bwelden@imvu.com> | 2013-01-08 09:44:28 -0800 |
---|---|---|
committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-04-12 14:23:00 +0300 |
commit | 84b49c917c177e9fa49798b45a543f3ce68bf30b (patch) | |
tree | e974c710f04c2910bb8d10ee1132ddb92f787a23 /system/lib | |
parent | f4480b5d9b8281911249eca0bff4fa86f249a467 (diff) |
Revert "Auto upcast of pointer parameters to C++ routines."
This reverts commit 64cc5c47bed294d5efa2433655552530c0242503.
Diffstat (limited to 'system/lib')
-rwxr-xr-x | system/lib/embind/bind.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/system/lib/embind/bind.cpp b/system/lib/embind/bind.cpp index a4b67fa5..46924505 100755 --- a/system/lib/embind/bind.cpp +++ b/system/lib/embind/bind.cpp @@ -190,6 +190,8 @@ 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) {
+ // The final parameter is a place-holder for a hint, a feature which is not currently implemented
+ // in the emscripten runtime. The compiler passes a dummy value of -1, and so do we.
int ret = (int)__staticPointerCast((void *)p, __getDynamicPointerType(p), to);
if (ret < 0) {
return 0;
@@ -212,16 +214,11 @@ namespace emscripten { return name;
}
- int EMSCRIPTEN_KEEPALIVE __peek32(int p) {
- return *(int *)p;
- }
-
EMSCRIPTEN_BINDINGS(([]() {
// We bind __getDerivationPath in order to take advantage of the std::vector to Javascript array
// conversion for the return value. This has the unfortunate side-effect of exposing it to third party
// developers, but perhaps the double underscore will scare them away from calling it.
function("__getDerivationPath", &__getDerivationPath);
- function("__peek32", &__peek32);
}));
}
|