diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-12-07 14:50:07 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-12-07 14:50:07 -0800 |
| commit | 33ca644b5b3e78af1998db308efda6a57c42bd28 (patch) | |
| tree | fc35b9a14272c00543d1f7edafa752a61cb6de6a /system/include | |
| parent | 19e25f10d8808a5f27e5fea0df15de3f326a31b5 (diff) | |
| parent | ab399ca532fb1deb7607f6cc2feb01186d75ec2b (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system/include')
| -rw-r--r-- | system/include/emscripten/bind.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h index 4a82eacb..8ce95de7 100644 --- a/system/include/emscripten/bind.h +++ b/system/include/emscripten/bind.h @@ -218,7 +218,7 @@ namespace emscripten { template<typename ClassType, typename ReturnType, typename... Args> struct MethodInvoker { typedef ReturnType (ClassType::*MemberPointer)(Args...); - typename internal::BindingType<ReturnType>::WireType invoke( + static typename internal::BindingType<ReturnType>::WireType invoke( ClassType* ptr, const MemberPointer& method, typename internal::BindingType<Args>::WireType... args |