summaryrefslogtreecommitdiff
path: root/src/bindings
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-02-29 11:01:04 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-02-29 11:01:04 -0300
commitd40b046685263b1a3afec595dc08b91e2dcc9371 (patch)
treeeb77ed2b7cdb8fa4d0e6b731c51633a87ad194c3 /src/bindings
parent9ad7ddbcd425702077b7cbf17c9de0f97e1ec956 (diff)
eolian-cxx: Fix C++ events with new Eo_Event_Cb signature
Diffstat (limited to 'src/bindings')
-rw-r--r--src/bindings/eo_cxx/eo_cxx_interop.hh6
-rw-r--r--src/bindings/eo_cxx/eo_event.hh8
2 files changed, 6 insertions, 8 deletions
diff --git a/src/bindings/eo_cxx/eo_cxx_interop.hh b/src/bindings/eo_cxx/eo_cxx_interop.hh
index e0fd2ed355..7cd7b3577b 100644
--- a/src/bindings/eo_cxx/eo_cxx_interop.hh
+++ b/src/bindings/eo_cxx/eo_cxx_interop.hh
@@ -438,11 +438,9 @@ C get_callback()
438} 438}
439 439
440template <typename F> 440template <typename F>
441Eina_Bool free_callback_calback(void* data, Eo* obj EINA_UNUSED 441Eina_Bool free_callback_callback(void* data, ::Eo_Event2 const*)
442 , Eo_Event_Description const* e EINA_UNUSED
443 , void* event_info EINA_UNUSED)
444{ 442{
445 delete (F*) data; 443 delete static_cast<F*>(data);
446 return EO_CALLBACK_CONTINUE; 444 return EO_CALLBACK_CONTINUE;
447} 445}
448 446
diff --git a/src/bindings/eo_cxx/eo_event.hh b/src/bindings/eo_cxx/eo_event.hh
index 965a2c6697..d0b335e0e5 100644
--- a/src/bindings/eo_cxx/eo_event.hh
+++ b/src/bindings/eo_cxx/eo_event.hh
@@ -137,12 +137,12 @@ Eina_Bool really_call_event(T& wrapper, F& f, Eo_Event_Description const& desc,
137 137
138template <typename T, typename F> 138template <typename T, typename F>
139Eina_Bool 139Eina_Bool
140event_callback(void *data, Eo *obj, Eo_Event_Description const* desc, void *info) 140event_callback(void *data, ::Eo_Event2 const* event)
141{ 141{
142 T wrapper(::eo_ref(obj)); 142 T wrapper(::eo_ref(event->obj));
143 F *f = static_cast<F*>(data); 143 F *f = static_cast<F*>(data);
144 return _detail::really_call_event(wrapper, *f, *desc, info 144 return _detail::really_call_event(wrapper, *f, *event->desc, event->event_info
145 , std::is_void<decltype((*f)(wrapper, *desc, info))>()); 145 , std::is_void<decltype((*f)(wrapper, *event->desc, event->event_info))>());
146} 146}
147 147
148} 148}