summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeongjong Lee <yj34.lee@samsung.com>2019-10-31 18:21:42 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2019-10-31 18:39:54 -0300
commit11fb54e4bc7daa3378649bd68d668b0cf614839b (patch)
tree504a0e21846dd9770b9794941018efa72e3d937d
parent81165d743fae05dbf47d2e639f09b073874d306a (diff)
mono: remove duplicated EinaFreeCb delegate
Summary: Use Eina.Claabacks.EinaFreeCb instead. Reviewers: lauromoura Reviewed By: lauromoura Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10577
-rw-r--r--src/bin/eolian_mono/eolian/mono/function_pointer.hh4
-rw-r--r--src/bin/eolian_mono/eolian/mono/parameter.hh2
-rw-r--r--src/bindings/mono/eo_mono/iwrapper.cs4
-rw-r--r--src/bindings/mono/eo_mono/workaround.cs1
4 files changed, 5 insertions, 6 deletions
diff --git a/src/bin/eolian_mono/eolian/mono/function_pointer.hh b/src/bin/eolian_mono/eolian/mono/function_pointer.hh
index 0baab70e41..0e80659b48 100644
--- a/src/bin/eolian_mono/eolian/mono/function_pointer.hh
+++ b/src/bin/eolian_mono/eolian/mono/function_pointer.hh
@@ -76,9 +76,9 @@ struct function_pointer {
76 << "{\n\n" 76 << "{\n\n"
77 << scope_tab << "private " << f_name << "Internal _cb;\n" 77 << scope_tab << "private " << f_name << "Internal _cb;\n"
78 << scope_tab << "private IntPtr _cb_data;\n" 78 << scope_tab << "private IntPtr _cb_data;\n"
79 << scope_tab << "private EinaFreeCb _cb_free_cb;\n\n" 79 << scope_tab << "private Eina.Callbacks.EinaFreeCb _cb_free_cb;\n\n"
80 80
81 << scope_tab << "internal " << f_name << "Wrapper (" << f_name << "Internal _cb, IntPtr _cb_data, EinaFreeCb _cb_free_cb)\n" 81 << scope_tab << "internal " << f_name << "Wrapper (" << f_name << "Internal _cb, IntPtr _cb_data, Eina.Callbacks.EinaFreeCb _cb_free_cb)\n"
82 << scope_tab << "{\n" 82 << scope_tab << "{\n"
83 << scope_tab << scope_tab << "this._cb = _cb;\n" 83 << scope_tab << scope_tab << "this._cb = _cb;\n"
84 << scope_tab << scope_tab << "this._cb_data = _cb_data;\n" 84 << scope_tab << scope_tab << "this._cb_data = _cb_data;\n"
diff --git a/src/bin/eolian_mono/eolian/mono/parameter.hh b/src/bin/eolian_mono/eolian/mono/parameter.hh
index 38afef8cb5..55e12544ad 100644
--- a/src/bin/eolian_mono/eolian/mono/parameter.hh
+++ b/src/bin/eolian_mono/eolian/mono/parameter.hh
@@ -494,7 +494,7 @@ struct marshall_parameter_generator
494 ).generate(sink, std::make_tuple(param, param_name), context); 494 ).generate(sink, std::make_tuple(param, param_name), context);
495 495
496 return as_generator( 496 return as_generator(
497 "IntPtr " << param_name << "_data, " << type << "Internal " << param_name << ", EinaFreeCb " 497 "IntPtr " << param_name << "_data, " << type << "Internal " << param_name << ", Eina.Callbacks.EinaFreeCb "
498 << param_name << "_free_cb" 498 << param_name << "_free_cb"
499 ).generate(sink, param, context); 499 ).generate(sink, param, context);
500 } 500 }
diff --git a/src/bindings/mono/eo_mono/iwrapper.cs b/src/bindings/mono/eo_mono/iwrapper.cs
index db4213d3ec..12a7b3262f 100644
--- a/src/bindings/mono/eo_mono/iwrapper.cs
+++ b/src/bindings/mono/eo_mono/iwrapper.cs
@@ -738,9 +738,9 @@ public static class Globals
738 efl_mono_wrapper_supervisor_callbacks_set(FreeWrapperSupervisorCallbackDelegate); 738 efl_mono_wrapper_supervisor_callbacks_set(FreeWrapperSupervisorCallbackDelegate);
739 } 739 }
740 740
741 internal static void ThreadSafeFreeCbExec(EinaFreeCb cbFreeCb, IntPtr cbData) 741 internal static void ThreadSafeFreeCbExec(Eina.Callbacks.EinaFreeCb cbFreeCb, IntPtr cbData)
742 { 742 {
743 EinaFreeCb cb = (IntPtr gcHandlePtr) => { 743 Eina.Callbacks.EinaFreeCb cb = (IntPtr gcHandlePtr) => {
744 cbFreeCb(cbData); 744 cbFreeCb(cbData);
745 GCHandle gcHandle = GCHandle.FromIntPtr(gcHandlePtr); 745 GCHandle gcHandle = GCHandle.FromIntPtr(gcHandlePtr);
746 gcHandle.Free(); 746 gcHandle.Free();
diff --git a/src/bindings/mono/eo_mono/workaround.cs b/src/bindings/mono/eo_mono/workaround.cs
index 7730545092..66c3ec5879 100644
--- a/src/bindings/mono/eo_mono/workaround.cs
+++ b/src/bindings/mono/eo_mono/workaround.cs
@@ -232,5 +232,4 @@ public struct ActionData
232} // namespace Efl 232} // namespace Efl
233 233
234// Global delegates 234// Global delegates
235public delegate void EinaFreeCb(IntPtr data);
236public delegate void EvasSmartCb(IntPtr data, IntPtr obj, IntPtr event_info); 235public delegate void EvasSmartCb(IntPtr data, IntPtr obj, IntPtr event_info);