diff options
| author | Chad Austin <chad@imvu.com> | 2013-03-21 01:23:25 -0700 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-04-12 14:26:34 +0300 |
| commit | 0b8597a8dbf36b26dfb76df8d11fa7377bd810f1 (patch) | |
| tree | c9ba1b49beda1b8a594adbc94536d779c099437b | |
| parent | e10ede1e07ee85d9d99bd34eb4ec8a62ae972616 (diff) | |
Some tweaks to facilitate making value_struct and value_tuple simpler.
| -rwxr-xr-x | system/include/emscripten/bind.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h index b7b17f20..ad7e7b35 100755 --- a/system/include/emscripten/bind.h +++ b/system/include/emscripten/bind.h @@ -370,14 +370,14 @@ namespace emscripten { typedef internal::BindingType<MemberType> MemberBinding; typedef typename MemberBinding::WireType WireType; - static WireType get( - ClassType& ptr, + static WireType getWire( + const ClassType& ptr, const MemberPointer& field ) { return MemberBinding::toWireType(ptr.*field); } - static void set( + static void setWire( ClassType& ptr, const MemberPointer& field, WireType value @@ -387,7 +387,7 @@ namespace emscripten { template<typename Getter> static WireType propertyGet( - ClassType& ptr, + const ClassType& ptr, const Getter& getter ) { return MemberBinding::toWireType(getter(ptr)); @@ -425,8 +425,8 @@ namespace emscripten { internal::_embind_register_tuple_element( internal::TypeID<ClassType>::get(), internal::TypeID<ElementType>::get(), - reinterpret_cast<internal::GenericFunction>(&internal::MemberAccess<ClassType, ElementType>::get), - reinterpret_cast<internal::GenericFunction>(&internal::MemberAccess<ClassType, ElementType>::set), + reinterpret_cast<internal::GenericFunction>(&internal::MemberAccess<ClassType, ElementType>::getWire), + reinterpret_cast<internal::GenericFunction>(&internal::MemberAccess<ClassType, ElementType>::setWire), sizeof(field), &field); @@ -511,8 +511,8 @@ namespace emscripten { internal::TypeID<ClassType>::get(), fieldName, internal::TypeID<FieldType>::get(), - reinterpret_cast<internal::GenericFunction>(&internal::MemberAccess<ClassType, FieldType>::get), - reinterpret_cast<internal::GenericFunction>(&internal::MemberAccess<ClassType, FieldType>::set), + reinterpret_cast<internal::GenericFunction>(&internal::MemberAccess<ClassType, FieldType>::getWire), + reinterpret_cast<internal::GenericFunction>(&internal::MemberAccess<ClassType, FieldType>::setWire), sizeof(field), &field); @@ -865,8 +865,8 @@ namespace emscripten { TypeID<ClassType>::get(), fieldName, TypeID<FieldType>::get(), - reinterpret_cast<GenericFunction>(&MemberAccess<ClassType, FieldType>::get), - reinterpret_cast<GenericFunction>(&MemberAccess<ClassType, FieldType>::set), + reinterpret_cast<GenericFunction>(&MemberAccess<ClassType, FieldType>::getWire), + reinterpret_cast<GenericFunction>(&MemberAccess<ClassType, FieldType>::setWire), sizeof(field), &field); return *this; |