diff options
| -rwxr-xr-x | src/embind/embind.js | 4 | ||||
| -rwxr-xr-x | system/include/emscripten/wire.h | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/embind/embind.js b/src/embind/embind.js index 589f7ba9..b5be4602 100755 --- a/src/embind/embind.js +++ b/src/embind/embind.js @@ -840,7 +840,7 @@ function __embind_register_class_constructor( var argTypes = requireArgumentTypes(rawArgTypes, humanName); classType.constructor.body = function() { if (arguments.length !== argCount - 1) { - throwBindingError('emscripten binding ' + humanName + ' called with ' + arguments.length + ' arguments, expected ' + (argCount-1)); + throwBindingError(humanName + ' called with ' + arguments.length + ' arguments, expected ' + (argCount-1)); } var destructors = []; var args = new Array(argCount); @@ -873,7 +873,7 @@ function __embind_register_class_smart_ptr_constructor( var argTypes = requireArgumentTypes(rawArgTypes, humanName); classType.constructor.body = function() { if (arguments.length !== argCount - 1) { - throwBindingError(humanName + ' + called with ' + arguments.length + ' arguments, expected ' + (argCount-1)); + throwBindingError(humanName + ' called with ' + arguments.length + ' arguments, expected ' + (argCount-1)); } var destructors = []; var args = new Array(argCount); diff --git a/system/include/emscripten/wire.h b/system/include/emscripten/wire.h index 1be23e78..d4efc3ac 100755 --- a/system/include/emscripten/wire.h +++ b/system/include/emscripten/wire.h @@ -210,6 +210,17 @@ namespace emscripten { }; template<typename T> + struct BindingType<T&&> { + typedef typename BindingType<T>::WireType WireType; + static WireType toWireType(const T& v) { + return BindingType<T>::toWireType(v); + } + static T fromWireType(WireType wt) { + return BindingType<T>::fromWireType(wt); + } + }; + + template<typename T> struct BindingType<T*> { typedef T* WireType; static WireType toWireType(T* p) { |