The new fields added in svn_wc.h cause the following errors:

subversion/bindings/swig/python/svn_wc.c: In function 
‘_wrap_svn_wc_conflict_description2_t_prop_value_base_set’:
subversion/bindings/swig/python/svn_wc.c:8798: error: ‘_global_pool’ 
undeclared (first use in this function)
subversion/bindings/swig/python/svn_wc.c:8798: error: (Each undeclared 
identifier is reported only once
subversion/bindings/swig/python/svn_wc.c:8798: error: for each function it 
appears in.)
subversion/bindings/swig/python/svn_wc.c: In function 
‘_wrap_svn_wc_conflict_description2_t_prop_value_working_set’:
subversion/bindings/swig/python/svn_wc.c:8859: error: ‘_global_pool’ 
undeclared (first use in this function)
subversion/bindings/swig/python/svn_wc.c: In function 
‘_wrap_svn_wc_conflict_description2_t_prop_value_incoming_old_set’:
subversion/bindings/swig/python/svn_wc.c:8920: error: ‘_global_pool’ 
undeclared (first use in this function)
subversion/bindings/swig/python/svn_wc.c: In function 
‘_wrap_svn_wc_conflict_description2_t_prop_value_incoming_new_set’:
subversion/bindings/swig/python/svn_wc.c:8981: error: ‘_global_pool’ 
undeclared (first use in this function)

because the memberin typemaps for svn_string_t assume they are used in 
functions that also receive the pool argument. Trivial fix (ignoring the 
offending structure in bindings) is attached.

A better fix would probably be fix the memberin typemaps for svn_string_t, but 
I do not know the specifics of pool usage in SWIG to do that.


Regards,
Alexey.
Index: subversion/bindings/swig/svn_wc.i
===================================================================
--- subversion/bindings/swig/svn_wc.i	(revision 1619259)
+++ subversion/bindings/swig/svn_wc.i	(working copy)
@@ -40,8 +40,9 @@
 */
 %ignore svn_wc_set_auth_file;
 
-/* ### ignore this structure because the accessors will need a pool */
+/* ### ignore these structures because the accessors will need a pool */
 %ignore svn_wc_keywords_t;
+%ignore svn_wc_conflict_description2_t;
 
 #ifdef SWIGRUBY
 %ignore svn_wc_external_item_create;

Reply via email to