aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormey <mey@imvu.com>2012-11-09 17:14:07 -0800
committerJukka Jylänki <jujjyl@gmail.com>2013-04-12 14:21:47 +0300
commit8ff84649adf2120ad7800f9bba03fff194b657bb (patch)
tree82dfb3dc11b40cbc80ae34713a02911bc483cc84
parent01212260c27a76c7f02b62a4c42c3d4501351e60 (diff)
Merging.
-rw-r--r--src/embind/embind.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/embind/embind.js b/src/embind/embind.js
index 1953542a..4cf58028 100644
--- a/src/embind/embind.js
+++ b/src/embind/embind.js
@@ -421,7 +421,6 @@ function __embind_register_smart_ptr(
return new Handle(ptr);
},
toWireType: function(destructors, o) {
- return o.smartPointer;
if (null === o) {
return 0;
} else {