Author: rschupp
Date: Thu Jan 1 15:15:19 2015
New Revision: 1648852
URL: http://svn.apache.org/r1648852
Log:
Make (cancel_func, cancel_baton) parameter pairs work in Perl bindings.
[in subversion/bindings/swig]
* include/svn_types.swg: Consolidate the existing, separate Python and Ruby
%typemaps for (svn_cancel_func_t cancel_func, void *cancel_baton)
into one %callback_typemap and add the Perl equivalent.
* svn_client.i: Remove the redundant, Ruby-only %callback_typemap for
this parameter pair.
Modified:
subversion/trunk/subversion/bindings/swig/include/svn_types.swg
subversion/trunk/subversion/bindings/swig/svn_client.i
Modified: subversion/trunk/subversion/bindings/swig/include/svn_types.swg
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/include/svn_types.swg?rev=1648852&r1=1648851&r2=1648852&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/include/svn_types.swg (original)
+++ subversion/trunk/subversion/bindings/swig/include/svn_types.swg Thu Jan 1
15:15:19 2015
@@ -807,20 +807,12 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
Callback: svn_cancel_func_t
*/
-#ifdef SWIGPYTHON
-%typemap(in) (svn_cancel_func_t cancel_func, void *cancel_baton) {
- $1 = svn_swig_py_cancel_func;
- $2 = $input; /* our function is the baton. */
-}
-#endif
+%callback_typemap(svn_cancel_func_t cancel_func, void *cancel_baton,
+ svn_swig_py_cancel_func,
+ svn_swig_pl_cancel_func,
+ svn_swig_rb_cancel_func)
#ifdef SWIGRUBY
-%typemap(in) (svn_cancel_func_t cancel_func, void *cancel_baton)
-{
- $1 = svn_swig_rb_cancel_func;
- $2 = (void *)svn_swig_rb_make_baton($input, _global_svn_swig_rb_pool);
-}
-
%typemap(argout) (svn_cancel_func_t cancel_func, void *cancel_baton)
{
svn_swig_rb_set_baton($result, (VALUE)$2);
Modified: subversion/trunk/subversion/bindings/swig/svn_client.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/svn_client.i?rev=1648852&r1=1648851&r2=1648852&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/svn_client.i (original)
+++ subversion/trunk/subversion/bindings/swig/svn_client.i Thu Jan 1 15:15:19
2015
@@ -170,13 +170,6 @@
svn_swig_rb_get_commit_log_func)
#endif
-#ifdef SWIGRUBY
-%callback_typemap(svn_cancel_func_t cancel_func, void *cancel_baton,
- ,
- ,
- svn_swig_rb_cancel_func)
-#endif
-
%callback_typemap(svn_client_blame_receiver_t receiver, void *receiver_baton,
svn_swig_py_client_blame_receiver_func,
svn_swig_pl_blame_func,
