On 8/21/14 1:29 AM, Alexey Neyman wrote: > 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.
I have the "correct" fix but in so much as it makes things compile. But I don't know that it makes the svn_wc_conflict_description2_t setters do anything useful. Writing a test now, so I should have it fixed shortly.