projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
65bedf7
)
resolve ambiguous ‘operator==’ (‘int’ vs ‘const luabridge::LuaRef’)
author
Robin Gareus
<robin@gareus.org>
Sat, 27 Feb 2016 12:48:01 +0000
(13:48 +0100)
committer
Robin Gareus
<robin@gareus.org>
Sat, 27 Feb 2016 12:48:01 +0000
(13:48 +0100)
gtk2_ardour/luainstance.cc
patch
|
blob
|
history
diff --git
a/gtk2_ardour/luainstance.cc
b/gtk2_ardour/luainstance.cc
index 73454d0369b0fe19e5dc27da7aaaa6f23485fb4a..2ab50340d035826eaf6b7a8ee9a3ae28d9c39cbe 100644
(file)
--- a/
gtk2_ardour/luainstance.cc
+++ b/
gtk2_ardour/luainstance.cc
@@
-1114,15
+1114,18
@@
LuaCallback::connect_2 (enum LuaSignal::LuaSignal ls, T ref, PBD::Signal2<void,
template <typename T> void
LuaCallback::proxy_0 (enum LuaSignal::LuaSignal ls, T ref) {
template <typename T> void
LuaCallback::proxy_0 (enum LuaSignal::LuaSignal ls, T ref) {
- if (0 == (*_lua_call)((int)ls, ref)) { drop_callback (); /* EMIT SIGNAL */}
+ luabridge::LuaRef rv ((*_lua_call)((int)ls, ref));
+ if (! rv.cast<bool> ()) { drop_callback (); /* EMIT SIGNAL */}
}
template <typename T, typename C1> void
LuaCallback::proxy_1 (enum LuaSignal::LuaSignal ls, T ref, C1 a1) {
}
template <typename T, typename C1> void
LuaCallback::proxy_1 (enum LuaSignal::LuaSignal ls, T ref, C1 a1) {
- if (0 == (*_lua_call)((int)ls, ref, a1)) { drop_callback (); /* EMIT SIGNAL */}
+ luabridge::LuaRef rv ((*_lua_call)((int)ls, ref, a1));
+ if (! rv.cast<bool> ()) { drop_callback (); /* EMIT SIGNAL */}
}
template <typename T, typename C1, typename C2> void
LuaCallback::proxy_2 (enum LuaSignal::LuaSignal ls, T ref, C1 a1, C2 a2) {
}
template <typename T, typename C1, typename C2> void
LuaCallback::proxy_2 (enum LuaSignal::LuaSignal ls, T ref, C1 a1, C2 a2) {
- if (0 == (*_lua_call)((int)ls, ref, a1, a2)) { drop_callback (); /* EMIT SIGNAL */}
+ luabridge::LuaRef rv ((*_lua_call)((int)ls, ref, a1, a2));
+ if (! rv.cast<bool> ()) { drop_callback (); /* EMIT SIGNAL */}
}
}