diff options
| author | Chad Austin <chad@imvu.com> | 2013-01-23 11:54:00 -0800 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-04-12 14:23:36 +0300 |
| commit | 8a12d4c1c4aa9a57fdc414b3304555de8c7158ac (patch) | |
| tree | 0c8763dcc4d5eb5610ef71e423398039d886cb78 | |
| parent | ba7a7200ec2737c9890408e906ebe6bc2b9ca69c (diff) | |
fix a rebase conflict
| -rwxr-xr-x | src/embind/embind.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/embind/embind.js b/src/embind/embind.js index ae61f09f..d8a4a440 100755 --- a/src/embind/embind.js +++ b/src/embind/embind.js @@ -721,9 +721,8 @@ RegisteredRawPointer.prototype.fromWireTypeAutoDowncast = function(ptr) { // todo: can come back -1 or -2!! Throw appropriate exception return handle; } else { - handle = new this.Handle(ptr); + return new this.Handle(ptr); } - return handle; }; function RegisteredClassInstance(constructor, Handle) { |