| 2 | 2 |
Bug-Debian: https://bugs.debian.org/805584
|
| 3 | 3 |
Description: Build with SWIG 3.x
|
| 4 | 4 |
|
| 5 | |
--- a/src/bindings/csharp/local.i
|
| 6 | |
+++ b/src/bindings/csharp/local.i
|
| 7 | |
@@ -117,13 +117,13 @@ static SWIG_CSharpWStringHelperCallback
|
|
5 |
Index: libsbml/src/bindings/csharp/local.i
|
|
6 |
===================================================================
|
|
7 |
--- libsbml.orig/src/bindings/csharp/local.i
|
|
8 |
+++ libsbml/src/bindings/csharp/local.i
|
|
9 |
@@ -121,13 +121,13 @@ static SWIG_CSharpWStringHelperCallback
|
| 8 | 10 |
%pragma(csharp) imclasscode=%{
|
| 9 | 11 |
protected class SWIGWStringHelper {
|
| 10 | 12 |
|
|
| 21 | 23 |
string ustr = System.Runtime.InteropServices.Marshal.PtrToStringUni(cString);
|
| 22 | 24 |
return System.Runtime.InteropServices.Marshal.StringToHGlobalUni(ustr);
|
| 23 | 25 |
}
|
| 24 | |
@@ -203,15 +203,15 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
|
26 |
@@ -207,15 +207,15 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
| 25 | 27 |
*/
|
| 26 | 28 |
%typemap(cscode) SBMLExtension
|
| 27 | 29 |
%{
|
|
| 41 | 43 |
return new SBase(cPtr, owner);
|
| 42 | 44 |
}
|
| 43 | 45 |
%}
|
| 44 | |
@@ -224,9 +224,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
|
46 |
@@ -228,9 +228,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
| 45 | 47 |
%pragma(csharp) modulecode =
|
| 46 | 48 |
%{
|
| 47 | 49 |
|
|
| 53 | 55 |
|
| 54 | 56 |
SBMLExtension ext = new SBMLExtension(cPtr, false);
|
| 55 | 57 |
string pkgName = ext.getName();
|
| 56 | |
@@ -237,9 +237,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
|
58 |
@@ -241,9 +241,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
| 57 | 59 |
return new SBMLExtension(cPtr,owner);
|
| 58 | 60 |
}
|
| 59 | 61 |
|
|
| 65 | 67 |
|
| 66 | 68 |
SBMLNamespaces sbn = new SBMLNamespaces(cPtr, false);
|
| 67 | 69 |
if (sbn != null)
|
| 68 | |
@@ -289,9 +289,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
|
70 |
@@ -293,9 +293,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
| 69 | 71 |
return new SBMLConverter(cPtr,owner);
|
| 70 | 72 |
}
|
| 71 | 73 |
|
|
| 77 | 79 |
|
| 78 | 80 |
SBasePlugin sbp = new SBasePlugin(cPtr, false);
|
| 79 | 81 |
string pkgName = sbp.getPackageName();
|
| 80 | |
@@ -306,9 +306,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
|
82 |
@@ -310,9 +310,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
| 81 | 83 |
}
|
| 82 | 84 |
|
| 83 | 85 |
|
|
| 89 | 91 |
|
| 90 | 92 |
SBase sb = new SBase(cPtr, false);
|
| 91 | 93 |
string pkgName = sb.getPackageName();
|
| 92 | |
@@ -637,23 +637,23 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
|
94 |
@@ -641,23 +641,23 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
| 93 | 95 |
|
| 94 | 96 |
%typemap(csbody) TYPENAME
|
| 95 | 97 |
%{
|
|
| 120 | 122 |
|
| 121 | 123 |
if (obj != null)
|
| 122 | 124 |
{
|
| 123 | |
@@ -670,22 +670,22 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
|
125 |
@@ -674,22 +674,22 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
| 124 | 126 |
|
| 125 | 127 |
%typemap(csbody_derived) TYPENAME
|
| 126 | 128 |
%{
|
|
| 150 | 152 |
|
| 151 | 153 |
if (obj != null)
|
| 152 | 154 |
{
|
| 153 | |
@@ -701,22 +701,22 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
|
155 |
@@ -705,22 +705,22 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister
|
| 154 | 156 |
|
| 155 | 157 |
%typemap(csbody_derived) TYPENAME
|
| 156 | 158 |
%{
|
|
| 180 | 182 |
|
| 181 | 183 |
if (obj != null)
|
| 182 | 184 |
{
|
| 183 | |
@@ -981,10 +981,10 @@ COVARIANT_GETID(InitialAssignment)
|
|
185 |
@@ -985,10 +985,10 @@ COVARIANT_GETID(InitialAssignment)
|
| 184 | 186 |
%typemap(csbase) SBMLConstructorException "System.ArgumentException";
|
| 185 | 187 |
%typemap(cscode) SBMLConstructorException
|
| 186 | 188 |
%{
|
|
| 193 | 195 |
}
|
| 194 | 196 |
|
| 195 | 197 |
public SBMLConstructorException(string v) :
|
| 196 | |
@@ -995,10 +995,10 @@ COVARIANT_GETID(InitialAssignment)
|
|
198 |
@@ -999,10 +999,10 @@ COVARIANT_GETID(InitialAssignment)
|
| 197 | 199 |
%typemap(csbase) XMLConstructorException "System.ArgumentException";
|
| 198 | 200 |
%typemap(cscode) XMLConstructorException
|
| 199 | 201 |
%{
|
|
| 206 | 208 |
}
|
| 207 | 209 |
|
| 208 | 210 |
public XMLConstructorException(string v) :
|
| 209 | |
@@ -1037,7 +1037,7 @@ COVARIANT_GETID(InitialAssignment)
|
|
211 |
@@ -1041,7 +1041,7 @@ COVARIANT_GETID(InitialAssignment)
|
| 210 | 212 |
static CustomExceptionDelegate customDelegate =
|
| 211 | 213 |
new CustomExceptionDelegate(SetPendingCustomException);
|
| 212 | 214 |
|
|
| 215 | 217 |
public static extern
|
| 216 | 218 |
void CustomExceptionRegisterCallback(CustomExceptionDelegate customCallback);
|
| 217 | 219 |
|
| 218 | |
@@ -1389,8 +1389,8 @@ XMLCONSTRUCTOR_EXCEPTION(XMLTripple)
|
|
220 |
@@ -1393,8 +1393,8 @@ XMLCONSTRUCTOR_EXCEPTION(XMLTripple)
|
| 219 | 221 |
%typemap(cstype) List* _FNAME_ %{ _TYPENAME_ ## List %}
|
| 220 | 222 |
%typemap(csout) List* _FNAME_
|
| 221 | 223 |
{
|
|
| 226 | 228 |
}
|
| 227 | 229 |
%typemap(out) List* _FNAME_
|
| 228 | 230 |
{
|
| 229 | |
--- a/src/bindings/csharp/local-packages-arrays.i
|
| 230 | |
+++ b/src/bindings/csharp/local-packages-arrays.i
|
| 231 | |
@@ -39,9 +39,9 @@
|
|
231 |
Index: libsbml/src/bindings/csharp/local-packages-arrays.i
|
|
232 |
===================================================================
|
|
233 |
--- libsbml.orig/src/bindings/csharp/local-packages-arrays.i
|
|
234 |
+++ libsbml/src/bindings/csharp/local-packages-arrays.i
|
|
235 |
@@ -43,9 +43,9 @@
|
| 232 | 236 |
*/
|
| 233 | 237 |
%typemap(cscode) ArraysExtension
|
| 234 | 238 |
%{
|
|
| 240 | 244 |
|
| 241 | 245 |
SBasePlugin sbp = new SBasePlugin(cPtr, false);
|
| 242 | 246 |
SBase sb = sbp.getParentSBMLObject();
|
| 243 | |
@@ -53,9 +53,9 @@
|
|
247 |
@@ -57,9 +57,9 @@
|
| 244 | 248 |
}
|
| 245 | 249 |
}
|
| 246 | 250 |
|
|
| 252 | 256 |
|
| 253 | 257 |
SBase sb = new SBase(cPtr, false);
|
| 254 | 258 |
switch( sb.getTypeCode() )
|
| 255 | |
--- a/src/bindings/csharp/local-packages-groups.i
|
| 256 | |
+++ b/src/bindings/csharp/local-packages-groups.i
|
|
259 |
Index: libsbml/src/bindings/csharp/local-packages-groups.i
|
|
260 |
===================================================================
|
|
261 |
--- libsbml.orig/src/bindings/csharp/local-packages-groups.i
|
|
262 |
+++ libsbml/src/bindings/csharp/local-packages-groups.i
|
| 257 | 263 |
@@ -40,9 +40,9 @@
|
| 258 | 264 |
*/
|
| 259 | 265 |
%typemap(cscode) GroupsExtension
|
|
| 278 | 284 |
|
| 279 | 285 |
SBase sb = new SBase(cPtr, false);
|
| 280 | 286 |
switch( sb.getTypeCode() )
|
| 281 | |
--- a/src/bindings/csharp/local-packages-layout.i
|
| 282 | |
+++ b/src/bindings/csharp/local-packages-layout.i
|
|
287 |
Index: libsbml/src/bindings/csharp/local-packages-layout.i
|
|
288 |
===================================================================
|
|
289 |
--- libsbml.orig/src/bindings/csharp/local-packages-layout.i
|
|
290 |
+++ libsbml/src/bindings/csharp/local-packages-layout.i
|
| 283 | 291 |
@@ -33,9 +33,9 @@
|
| 284 | 292 |
*/
|
| 285 | 293 |
%typemap(cscode) LayoutExtension
|
|
| 304 | 312 |
|
| 305 | 313 |
SBase sb = new SBase(cPtr, false);
|
| 306 | 314 |
switch( sb.getTypeCode() )
|
| 307 | |
--- a/src/bindings/csharp/local-packages-render.i
|
| 308 | |
+++ b/src/bindings/csharp/local-packages-render.i
|
|
315 |
Index: libsbml/src/bindings/csharp/local-packages-render.i
|
|
316 |
===================================================================
|
|
317 |
--- libsbml.orig/src/bindings/csharp/local-packages-render.i
|
|
318 |
+++ libsbml/src/bindings/csharp/local-packages-render.i
|
| 309 | 319 |
@@ -32,9 +32,9 @@ COVARIANT_RTYPE_FUNCTION(GradientBase, g
|
| 310 | 320 |
*/
|
| 311 | 321 |
%typemap(cscode) RenderExtension
|
|
| 330 | 340 |
|
| 331 | 341 |
SBase sb = new SBase(cPtr, false);
|
| 332 | 342 |
switch( sb.getTypeCode() )
|
| 333 | |
--- a/src/bindings/csharp/local-packages-req.i
|
| 334 | |
+++ b/src/bindings/csharp/local-packages-req.i
|
| 335 | |
@@ -38,9 +38,9 @@
|
|
343 |
Index: libsbml/src/bindings/csharp/local-packages-req.i
|
|
344 |
===================================================================
|
|
345 |
--- libsbml.orig/src/bindings/csharp/local-packages-req.i
|
|
346 |
+++ libsbml/src/bindings/csharp/local-packages-req.i
|
|
347 |
@@ -42,9 +42,9 @@
|
| 336 | 348 |
*/
|
| 337 | 349 |
%typemap(cscode) ReqExtension
|
| 338 | 350 |
%{
|
|
| 344 | 356 |
|
| 345 | 357 |
SBasePlugin sbp = new SBasePlugin(cPtr, false);
|
| 346 | 358 |
SBase sb = sbp.getParentSBMLObject();
|
| 347 | |
@@ -53,9 +53,9 @@
|
|
359 |
@@ -57,9 +57,9 @@
|
| 348 | 360 |
}
|
| 349 | 361 |
}
|
| 350 | 362 |
|
|
| 356 | 368 |
|
| 357 | 369 |
SBase sb = new SBase(cPtr, false);
|
| 358 | 370 |
switch( sb.getTypeCode() )
|
| 359 | |
--- a/src/bindings/csharp/local-packages-spatial.i
|
| 360 | |
+++ b/src/bindings/csharp/local-packages-spatial.i
|
| 361 | |
@@ -62,9 +62,9 @@ void SampledField::getUncompressed(int *
|
|
371 |
Index: libsbml/src/bindings/csharp/local-packages-spatial.i
|
|
372 |
===================================================================
|
|
373 |
--- libsbml.orig/src/bindings/csharp/local-packages-spatial.i
|
|
374 |
+++ libsbml/src/bindings/csharp/local-packages-spatial.i
|
|
375 |
@@ -68,9 +68,9 @@ void SampledField::getUncompressed(int *
|
| 362 | 376 |
*/
|
| 363 | 377 |
%typemap(cscode) SpatialExtension
|
| 364 | 378 |
%{
|
|
| 370 | 384 |
|
| 371 | 385 |
SBasePlugin sbp = new SBasePlugin(cPtr, false);
|
| 372 | 386 |
SBase sb = sbp.getParentSBMLObject();
|
| 373 | |
@@ -96,9 +96,9 @@ void SampledField::getUncompressed(int *
|
|
387 |
@@ -102,9 +102,9 @@ void SampledField::getUncompressed(int *
|
| 374 | 388 |
}
|
| 375 | 389 |
}
|
| 376 | 390 |
|
|
| 381 | 395 |
+ if (cPtr.Equals(global::System.IntPtr.Zero)) return null;
|
| 382 | 396 |
|
| 383 | 397 |
SBase sb = new SBase(cPtr, false);
|
| 384 | |
switch( sb.getTypeCode() )
|
|
398 |
switch ( sb.getTypeCode() )
|