From: StefanBruens <stefan.bruens@rwth-aachen.de>
Date: Mon, 12 Aug 2019 22:27:42 +0000 (+0200)
Subject: Make code compatible with swig 4.0, remove obj0 instances
X-Git-Tag: 0.7.6~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5410dd13ed2df232b32cd229b31e4bdaf5eb7af2;p=thirdparty%2Flibsolv.git

Make code compatible with swig 4.0, remove obj0 instances

The deprecated "-aliasobj0" option was removed in swig 4.0, and
obj0, which was only meant as a porting helper, is no longer available:
https://github.com/swig/swig/commit/cd8fc0a025fb
Use the correct "$self" notation, which is expanded to the correct
code regardless of swig version and options.
---

diff --git a/bindings/solv.i b/bindings/solv.i
index 50ee5742..48d3f1fb 100644
--- a/bindings/solv.i
+++ b/bindings/solv.i
@@ -629,10 +629,8 @@ SWIG_AsValDepId(void *obj, int *val) {
 %typemap(out) disown_helper {
 #if defined(SWIGRUBY)
   SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN |  0 );
-#elif defined(SWIGPYTHON) && SWIG_VERSION < 0x040000
-  SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN |  0 );
 #elif defined(SWIGPYTHON)
-  SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN |  0 );
+  SWIG_ConvertPtr($self, &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN |  0 );
 #elif defined(SWIGPERL)
   SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_Pool, SWIG_POINTER_DISOWN |  0 );
 #elif defined(SWIGTCL)
@@ -656,7 +654,7 @@ SWIG_AsValDepId(void *obj, int *val) {
 %define returnself(func)
 #if defined(SWIGPYTHON)
 %typemap(out) void func {
-  $result = obj0;
+  $result = $self;
   Py_INCREF($result);
 }
 #elif defined(SWIGPERL)