svn commit: r1600265 - /subversion/trunk/subversion/bindings/swig/include/svn_containers.swg

[rh...@apache.org]

Author: rhuijben
Date: Wed Jun  4 15:01:01 2014
New Revision: 1600265

URL: http://svn.apache.org/r1600265
Log:
Attempt to fix build breakage introduced in r1600096, by updating a swig
definition that is now referenced from a struct.

* subversion/bindings/swig/include/svn_containers.swg
  (apr_hash_t *MERGEINFO): Find global pool like how we handle it in other
    locations.

Modified:
    subversion/trunk/subversion/bindings/swig/include/svn_containers.swg

Modified: subversion/trunk/subversion/bindings/swig/include/svn_containers.swg
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/include/svn_containers.swg?rev=1600265&r1=1600264&r2=1600265&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/include/svn_containers.swg (original)
+++ subversion/trunk/subversion/bindings/swig/include/svn_containers.swg Wed Jun  4 15:01:01 2014
@@ -801,7 +801,16 @@
    apr_hash_t * <const char *, apr_array_header_t * <svn_merge_range_t *>>
 */
 #ifdef SWIGPYTHON
-%typemap(in) apr_hash_t *MERGEINFO {
+%typemap(in) apr_hash_t *MERGEINFO
+  (apr_pool_t *_global_pool = NULL, PyObject *_global_py_pool = NULL)
+{
+  if (_global_pool == NULL)
+  {
+    if (svn_swig_py_get_parent_pool(args, $descriptor(apr_pool_t *),
+                                    &_global_py_pool, &_global_pool))
+      SWIG_fail;
+  }
+
   $1 = svn_swig_py_mergeinfo_from_dict($input, _global_pool);
   if (PyErr_Occurred()) {
     SWIG_fail;