diff options
| -rwxr-xr-x | src/embind/embind.js | 6 | ||||
| -rwxr-xr-x | system/include/emscripten/wire.h | 18 |
2 files changed, 3 insertions, 21 deletions
diff --git a/src/embind/embind.js b/src/embind/embind.js index 37439912..df581298 100755 --- a/src/embind/embind.js +++ b/src/embind/embind.js @@ -1277,15 +1277,11 @@ function __embind_register_interface( }); } -function __embind_register_constant(name, type, value, destructor) { +function __embind_register_constant(name, type, value) { name = Pointer_stringify(name); whenDependentTypesAreResolved([], [type], function(type) { type = type[0]; - /*global console*/ - //console.log('type', type); - //console.log('value', value); Module[name] = type.fromWireType(value); - // todo: I need to natively destruct 'value' here return []; }); } diff --git a/system/include/emscripten/wire.h b/system/include/emscripten/wire.h index 9c8cd096..64114491 100755 --- a/system/include/emscripten/wire.h +++ b/system/include/emscripten/wire.h @@ -182,25 +182,11 @@ namespace emscripten { }; template<typename T> - struct BindingType<const 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); - } + struct BindingType<const T> : public BindingType<T> { }; template<typename T> - struct BindingType<const 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); - } + struct BindingType<const T&> : public BindingType<T> { }; template<typename T> |