diff options
| author | Bill Welden <bwelden@imvu.com> | 2012-12-31 11:39:59 -0800 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-04-12 14:22:47 +0300 |
| commit | d069ed414249db41a4dfa91061e8979d6c9dccca (patch) | |
| tree | 86dfd2c99734ff2d3b971ad2b60e27c30a22bbe3 /system | |
| parent | 55c72d46d7c90a0e282b119c17496b2909784144 (diff) | |
clear distinction between raw (C++) and cooked (Javascript class instances) types.
Diffstat (limited to 'system')
| -rwxr-xr-x | system/include/emscripten/bind.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h index c37aed24..a5985af5 100755 --- a/system/include/emscripten/bind.h +++ b/system/include/emscripten/bind.h @@ -123,14 +123,14 @@ namespace emscripten { size_t memberFunctionSize, void* memberFunction); - void _embind_register_cast_method( + void _embind_register_raw_cast_method( TYPEID classType, bool isPolymorphic, const char* methodName, TYPEID returnType, GenericFunction invoker); - void _embind_register_pointer_cast_method( + void _embind_register_smart_cast_method( TYPEID pointerType, TYPEID returnType, TYPEID returnPointeeType, @@ -614,7 +614,7 @@ namespace emscripten { using namespace internal; typedef typename ReturnType::element_type ReturnPointeeType; typedef typename PointerType::element_type PointeeType; - _embind_register_pointer_cast_method( + _embind_register_smart_cast_method( TypeID<PointerType>::get(), TypeID<ReturnType>::get(), TypeID<ReturnPointeeType>::get(), @@ -761,7 +761,7 @@ namespace emscripten { class_& cast(const char* methodName) { using namespace internal; - _embind_register_cast_method( + _embind_register_raw_cast_method( TypeID<ClassType>::get(), std::is_polymorphic<ClassType>::value, methodName, |