Build with SWIG 3.x

Bug-Debian: https://bugs.debian.org/805584


Gbp-Pq: Name swig-3.x.patch

7 files changed, 67 insertions, 67 deletions

diff --git a/src/bindings/csharp/local-packages-arrays.i b/src/bindings/csharp/local-packages-arrays.i
index 2145ed9e..a2d1965e 100644
--- a/src/bindings/csharp/local-packages-arrays.i
+++ b/src/bindings/csharp/local-packages-arrays.i
@@ -48,9 +48,9 @@
  */
 %typemap(cscode) ArraysExtension
 %{
-	public override SBasePlugin DowncastSBasePlugin(IntPtr cPtr, bool owner)
+	public override SBasePlugin DowncastSBasePlugin(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBasePlugin sbp = new SBasePlugin(cPtr, false);
 		SBase sb = sbp.getParentSBMLObject();
@@ -62,9 +62,9 @@
 		}
 	}
 
-	public override SBase DowncastSBase(IntPtr cPtr, bool owner)
+	public override SBase DowncastSBase(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBase sb = new SBase(cPtr, false);
 		switch( sb.getTypeCode() )
diff --git a/src/bindings/csharp/local-packages-groups.i b/src/bindings/csharp/local-packages-groups.i
index 6f739436..c18b4643 100644
--- a/src/bindings/csharp/local-packages-groups.i
+++ b/src/bindings/csharp/local-packages-groups.i
@@ -45,9 +45,9 @@
  */
 %typemap(cscode) GroupsExtension
 %{
-	public override SBasePlugin DowncastSBasePlugin(IntPtr cPtr, bool owner)
+	public override SBasePlugin DowncastSBasePlugin(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBasePlugin sbp = new SBasePlugin(cPtr, false);
 		SBase sb = sbp.getParentSBMLObject();
@@ -66,9 +66,9 @@
 		}
 	}
 
-	public override SBase DowncastSBase(IntPtr cPtr, bool owner)
+	public override SBase DowncastSBase(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBase sb = new SBase(cPtr, false);
 		switch( sb.getTypeCode() )
diff --git a/src/bindings/csharp/local-packages-layout.i b/src/bindings/csharp/local-packages-layout.i
index 8abd6a6e..ca195604 100755
--- a/src/bindings/csharp/local-packages-layout.i
+++ b/src/bindings/csharp/local-packages-layout.i
@@ -38,9 +38,9 @@
  */
 %typemap(cscode) LayoutExtension
 %{
-	public override SBasePlugin DowncastSBasePlugin(IntPtr cPtr, bool owner)
+	public override SBasePlugin DowncastSBasePlugin(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBasePlugin sbp = new SBasePlugin(cPtr, false);
 		SBase sb = sbp.getParentSBMLObject();
@@ -62,9 +62,9 @@
 		}
 	}
 
-	public override SBase DowncastSBase(IntPtr cPtr, bool owner)
+	public override SBase DowncastSBase(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBase sb = new SBase(cPtr, false);
 		switch( sb.getTypeCode() )
diff --git a/src/bindings/csharp/local-packages-render.i b/src/bindings/csharp/local-packages-render.i
index aa9fea55..9565ef2b 100644
--- a/src/bindings/csharp/local-packages-render.i
+++ b/src/bindings/csharp/local-packages-render.i
@@ -37,9 +37,9 @@ COVARIANT_RTYPE_FUNCTION(GradientBase, getAllElements)
  */
 %typemap(cscode) RenderExtension
 %{
-	public override SBasePlugin DowncastSBasePlugin(IntPtr cPtr, bool owner)
+	public override SBasePlugin DowncastSBasePlugin(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBasePlugin sbp = new SBasePlugin(cPtr, false);
 		SBase sb = sbp.getParentSBMLObject();
@@ -64,9 +64,9 @@ COVARIANT_RTYPE_FUNCTION(GradientBase, getAllElements)
 		}
 	}
 
-	public override SBase DowncastSBase(IntPtr cPtr, bool owner)
+	public override SBase DowncastSBase(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBase sb = new SBase(cPtr, false);
 		switch( sb.getTypeCode() )
diff --git a/src/bindings/csharp/local-packages-req.i b/src/bindings/csharp/local-packages-req.i
index 0c827d70..f4c71b72 100644
--- a/src/bindings/csharp/local-packages-req.i
+++ b/src/bindings/csharp/local-packages-req.i
@@ -47,9 +47,9 @@
  */
 %typemap(cscode) ReqExtension
 %{
-  public override SBasePlugin DowncastSBasePlugin(IntPtr cPtr, bool owner)
+  public override SBasePlugin DowncastSBasePlugin(global::System.IntPtr cPtr, bool owner)
   {
-    if (cPtr.Equals(IntPtr.Zero)) return null;
+    if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 
     SBasePlugin sbp = new SBasePlugin(cPtr, false);
     SBase sb = sbp.getParentSBMLObject();
@@ -62,9 +62,9 @@
     }
   }
 
-  public override SBase DowncastSBase(IntPtr cPtr, bool owner)
+  public override SBase DowncastSBase(global::System.IntPtr cPtr, bool owner)
   {
-    if (cPtr.Equals(IntPtr.Zero)) return null;
+    if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 
     SBase sb = new SBase(cPtr, false);
     switch( sb.getTypeCode() )
diff --git a/src/bindings/csharp/local-packages-spatial.i b/src/bindings/csharp/local-packages-spatial.i
index c8e22d10..7e2e8541 100644
--- a/src/bindings/csharp/local-packages-spatial.i
+++ b/src/bindings/csharp/local-packages-spatial.i
@@ -73,9 +73,9 @@ void SampledField::getUncompressed(int *outputSamples);
  */
 %typemap(cscode) SpatialExtension
 %{
-  public override SBasePlugin DowncastSBasePlugin(IntPtr cPtr, bool owner)
+  public override SBasePlugin DowncastSBasePlugin(global::System.IntPtr cPtr, bool owner)
   {
-    if (cPtr.Equals(IntPtr.Zero)) return null;
+    if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 
     SBasePlugin sbp = new SBasePlugin(cPtr, false);
     SBase sb = sbp.getParentSBMLObject();
@@ -107,9 +107,9 @@ void SampledField::getUncompressed(int *outputSamples);
     }
   }
 
-  public override SBase DowncastSBase(IntPtr cPtr, bool owner)
+  public override SBase DowncastSBase(global::System.IntPtr cPtr, bool owner)
   {
-    if (cPtr.Equals(IntPtr.Zero)) return null;
+    if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 
     SBase sb = new SBase(cPtr, false);
     switch ( sb.getTypeCode() )
diff --git a/src/bindings/csharp/local.i b/src/bindings/csharp/local.i
index 201bd590..9e246369 100644
--- a/src/bindings/csharp/local.i
+++ b/src/bindings/csharp/local.i
@@ -129,13 +129,13 @@ static SWIG_CSharpWStringHelperCallback SWIG_csharp_wstring_callback = NULL;
 %pragma(csharp) imclasscode=%{
   protected class SWIGWStringHelper {
 
-    public delegate IntPtr SWIGWStringDelegate(IntPtr message);
+    public delegate global::System.IntPtr SWIGWStringDelegate(global::System.IntPtr message);
     static SWIGWStringDelegate wstringDelegate = new SWIGWStringDelegate(CreateWString);
 
-    [DllImport("$dllimport", EntryPoint="SWIGRegisterWStringCallback_$module")]
+    [global::System.Runtime.InteropServices.DllImport("$dllimport", EntryPoint="SWIGRegisterWStringCallback_$module")]
     public static extern void SWIGRegisterWStringCallback_$module(SWIGWStringDelegate wstringDelegate);
 
-    static IntPtr CreateWString([MarshalAs(UnmanagedType.LPWStr)]IntPtr cString) {
+    static global::System.IntPtr CreateWString([MarshalAs(UnmanagedType.LPWStr)]global::System.IntPtr cString) {
       string ustr = System.Runtime.InteropServices.Marshal.PtrToStringUni(cString);
       return System.Runtime.InteropServices.Marshal.StringToHGlobalUni(ustr);
     }
@@ -215,15 +215,15 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterWStringCallback_$module(SWIG_CSharpWStri
  */
 %typemap(cscode) SBMLExtension
 %{
-  public virtual SBasePlugin DowncastSBasePlugin(IntPtr cPtr, bool owner)
+  public virtual SBasePlugin DowncastSBasePlugin(global::System.IntPtr cPtr, bool owner)
   {
-    if (cPtr.Equals(IntPtr.Zero)) return null;
+    if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 	return new SBasePlugin(cPtr, owner);
   }
 
-  public virtual SBase DowncastSBase(IntPtr cPtr, bool owner)
+  public virtual SBase DowncastSBase(global::System.IntPtr cPtr, bool owner)
   {
-    if (cPtr.Equals(IntPtr.Zero)) return null;	  
+    if (cPtr.Equals(global::System.IntPtr.Zero)) return null;	  
     return new SBase(cPtr, owner);
   }
 %}
@@ -236,9 +236,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterWStringCallback_$module(SWIG_CSharpWStri
 %pragma(csharp) modulecode =
 %{
 
-	public static SBMLExtension DowncastExtension(IntPtr cPtr, bool owner)
+	public static SBMLExtension DowncastExtension(global::System.IntPtr cPtr, bool owner)
 	{		
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBMLExtension ext = new SBMLExtension(cPtr, false);
 		string pkgName = ext.getName();
@@ -249,9 +249,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterWStringCallback_$module(SWIG_CSharpWStri
 		return new SBMLExtension(cPtr,owner);
 	}
 	
-	public static SBMLNamespaces DowncastSBMLNamespaces(IntPtr cPtr, bool owner)
+	public static SBMLNamespaces DowncastSBMLNamespaces(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBMLNamespaces sbn = new SBMLNamespaces(cPtr, false);
 		if (sbn != null)
@@ -301,9 +301,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterWStringCallback_$module(SWIG_CSharpWStri
 		return new SBMLConverter(cPtr,owner);
 	}
 	
-	public static SBasePlugin DowncastSBasePlugin(IntPtr cPtr, bool owner)
+	public static SBasePlugin DowncastSBasePlugin(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBasePlugin sbp = new SBasePlugin(cPtr, false);
 		string pkgName = sbp.getPackageName();
@@ -318,9 +318,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterWStringCallback_$module(SWIG_CSharpWStri
 	}
 	
 
-	public static SBase DowncastSBase(IntPtr cPtr, bool owner)
+	public static SBase DowncastSBase(global::System.IntPtr cPtr, bool owner)
 	{
-		if (cPtr.Equals(IntPtr.Zero)) return null;
+		if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
 		
 		SBase sb = new SBase(cPtr, false);
 		string pkgName = sb.getPackageName();
@@ -649,23 +649,23 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterWStringCallback_$module(SWIG_CSharpWStri
 
 %typemap(csbody) TYPENAME
 %{
-	private HandleRef swigCPtr;
+	private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 	protected bool swigCMemOwn;
 	
-	CTOR_ATTRIB $csclassname(IntPtr cPtr, bool cMemoryOwn)
+	CTOR_ATTRIB $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn)
 	{
 		swigCMemOwn = cMemoryOwn;
-		swigCPtr    = new HandleRef(this, cPtr);
+		swigCPtr    = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
 	}
 	
-	GETCPTR_ATTRIB static HandleRef getCPtr($csclassname obj)
+	GETCPTR_ATTRIB static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj)
 	{
-		return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+		return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
 	}
 	
-	GETCPTR_ATTRIB static HandleRef getCPtrAndDisown ($csclassname obj)
+	GETCPTR_ATTRIB static global::System.Runtime.InteropServices.HandleRef getCPtrAndDisown ($csclassname obj)
 	{
-		HandleRef ptr = new HandleRef(null, IntPtr.Zero);
+		global::System.Runtime.InteropServices.HandleRef ptr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
 		
 		if (obj != null)
 		{
@@ -682,22 +682,22 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterWStringCallback_$module(SWIG_CSharpWStri
 
 %typemap(csbody_derived) TYPENAME
 %{
-	private HandleRef swigCPtr;
+	private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 	
-	CTOR_ATTRIB $csclassname(IntPtr cPtr, bool cMemoryOwn) : base($modulePINVOKE.$csclassname_SWIGUpcast(cPtr), cMemoryOwn)
+	CTOR_ATTRIB $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn) : base($modulePINVOKE.$csclassname_SWIGUpcast(cPtr), cMemoryOwn)
 	{
 		//super($modulePINVOKE.$csclassnameUpcast(cPtr), cMemoryOwn);
-		swigCPtr = new HandleRef(this, cPtr);
+		swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
 	}
 	
-	GETCPTR_ATTRIB static HandleRef getCPtr($csclassname obj)
+	GETCPTR_ATTRIB static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj)
 	{
-		return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+		return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
 	}
 	
-	GETCPTR_ATTRIB static HandleRef getCPtrAndDisown ($csclassname obj)
+	GETCPTR_ATTRIB static global::System.Runtime.InteropServices.HandleRef getCPtrAndDisown ($csclassname obj)
 	{
-		HandleRef ptr = new HandleRef(null, IntPtr.Zero);
+		global::System.Runtime.InteropServices.HandleRef ptr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
 		
 		if (obj != null)
 		{
@@ -713,22 +713,22 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterWStringCallback_$module(SWIG_CSharpWStri
 
 %typemap(csbody_derived) TYPENAME
 %{
-	private HandleRef swigCPtr;
+	private global::System.Runtime.InteropServices.HandleRef swigCPtr;
 	
-	CTOR_ATTRIB $csclassname(IntPtr cPtr, bool cMemoryOwn) : base($modulePINVOKE.$csclassnameUpcast(cPtr), cMemoryOwn)
+	CTOR_ATTRIB $csclassname(global::System.IntPtr cPtr, bool cMemoryOwn) : base($modulePINVOKE.$csclassnameUpcast(cPtr), cMemoryOwn)
 	{
 		//super($modulePINVOKE.$csclassnameUpcast(cPtr), cMemoryOwn);
-		swigCPtr = new HandleRef(this, cPtr);
+		swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
 	}
 	
-	GETCPTR_ATTRIB static HandleRef getCPtr($csclassname obj)
+	GETCPTR_ATTRIB static global::System.Runtime.InteropServices.HandleRef getCPtr($csclassname obj)
 	{
-		return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;
+		return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
 	}
 	
-	GETCPTR_ATTRIB static HandleRef getCPtrAndDisown ($csclassname obj)
+	GETCPTR_ATTRIB static global::System.Runtime.InteropServices.HandleRef getCPtrAndDisown ($csclassname obj)
 	{
-		HandleRef ptr = new HandleRef(null, IntPtr.Zero);
+		global::System.Runtime.InteropServices.HandleRef ptr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
 		
 		if (obj != null)
 		{
@@ -993,10 +993,10 @@ COVARIANT_GETID(InitialAssignment)
 %typemap(csbase) SBMLConstructorException "System.ArgumentException";
 %typemap(cscode) SBMLConstructorException 
 %{
-  internal SBMLConstructorException(IntPtr cPtr, bool cMemoryOwn, string v) : base(v)
+  internal SBMLConstructorException(global::System.IntPtr cPtr, bool cMemoryOwn, string v) : base(v)
   {
     swigCMemOwn = cMemoryOwn;
-    swigCPtr    = new HandleRef(this, cPtr);
+    swigCPtr    = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
   }
 
   public SBMLConstructorException(string v) : 
@@ -1007,10 +1007,10 @@ COVARIANT_GETID(InitialAssignment)
 %typemap(csbase) XMLConstructorException "System.ArgumentException";
 %typemap(cscode) XMLConstructorException 
 %{
-  internal XMLConstructorException(IntPtr cPtr, bool cMemoryOwn, string v) : base(v)
+  internal XMLConstructorException(global::System.IntPtr cPtr, bool cMemoryOwn, string v) : base(v)
   {
     swigCMemOwn = cMemoryOwn;
-    swigCPtr    = new HandleRef(this, cPtr);
+    swigCPtr    = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
   }
 
   public XMLConstructorException(string v) : 
@@ -1049,7 +1049,7 @@ COVARIANT_GETID(InitialAssignment)
     static CustomExceptionDelegate customDelegate =
                                    new CustomExceptionDelegate(SetPendingCustomException);
 
-    [DllImport("$dllimport", EntryPoint="CustomExceptionRegisterCallback")]
+    [global::System.Runtime.InteropServices.DllImport("$dllimport", EntryPoint="CustomExceptionRegisterCallback")]
     public static extern
            void CustomExceptionRegisterCallback(CustomExceptionDelegate customCallback);
 
@@ -1401,8 +1401,8 @@ XMLCONSTRUCTOR_EXCEPTION(XMLTripple)
 %typemap(cstype)  List* _FNAME_ %{ _TYPENAME_ ## List %}
 %typemap(csout) List* _FNAME_ 
 { 
-  IntPtr cPtr = $imcall;
-  return (cPtr == IntPtr.Zero) ? null : new _TYPENAME_ ## List(cPtr, true);
+  global::System.IntPtr cPtr = $imcall;
+  return (cPtr == global::System.IntPtr.Zero) ? null : new _TYPENAME_ ## List(cPtr, true);
 }
 %typemap(out) List* _FNAME_ 
 {