Refresh patches
Andreas Tille
4 years ago
4 | 4 | |
5 | 5 | --- a/src/bindings/csharp/local.i |
6 | 6 | +++ b/src/bindings/csharp/local.i |
7 | @@ -117,13 +117,13 @@ static SWIG_CSharpWStringHelperCallback | |
7 | @@ -121,13 +121,13 @@ static SWIG_CSharpWStringHelperCallback | |
8 | 8 | %pragma(csharp) imclasscode=%{ |
9 | 9 | protected class SWIGWStringHelper { |
10 | 10 | |
21 | 21 | string ustr = System.Runtime.InteropServices.Marshal.PtrToStringUni(cString); |
22 | 22 | return System.Runtime.InteropServices.Marshal.StringToHGlobalUni(ustr); |
23 | 23 | } |
24 | @@ -203,15 +203,15 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
24 | @@ -207,15 +207,15 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
25 | 25 | */ |
26 | 26 | %typemap(cscode) SBMLExtension |
27 | 27 | %{ |
41 | 41 | return new SBase(cPtr, owner); |
42 | 42 | } |
43 | 43 | %} |
44 | @@ -224,9 +224,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
44 | @@ -228,9 +228,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
45 | 45 | %pragma(csharp) modulecode = |
46 | 46 | %{ |
47 | 47 | |
53 | 53 | |
54 | 54 | SBMLExtension ext = new SBMLExtension(cPtr, false); |
55 | 55 | string pkgName = ext.getName(); |
56 | @@ -237,9 +237,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
56 | @@ -241,9 +241,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
57 | 57 | return new SBMLExtension(cPtr,owner); |
58 | 58 | } |
59 | 59 | |
65 | 65 | |
66 | 66 | SBMLNamespaces sbn = new SBMLNamespaces(cPtr, false); |
67 | 67 | if (sbn != null) |
68 | @@ -289,9 +289,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
68 | @@ -293,9 +293,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
69 | 69 | return new SBMLConverter(cPtr,owner); |
70 | 70 | } |
71 | 71 | |
77 | 77 | |
78 | 78 | SBasePlugin sbp = new SBasePlugin(cPtr, false); |
79 | 79 | string pkgName = sbp.getPackageName(); |
80 | @@ -306,9 +306,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
80 | @@ -310,9 +310,9 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
81 | 81 | } |
82 | 82 | |
83 | 83 | |
89 | 89 | |
90 | 90 | SBase sb = new SBase(cPtr, false); |
91 | 91 | string pkgName = sb.getPackageName(); |
92 | @@ -637,23 +637,23 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
92 | @@ -641,23 +641,23 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
93 | 93 | |
94 | 94 | %typemap(csbody) TYPENAME |
95 | 95 | %{ |
120 | 120 | |
121 | 121 | if (obj != null) |
122 | 122 | { |
123 | @@ -670,22 +670,22 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
123 | @@ -674,22 +674,22 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
124 | 124 | |
125 | 125 | %typemap(csbody_derived) TYPENAME |
126 | 126 | %{ |
150 | 150 | |
151 | 151 | if (obj != null) |
152 | 152 | { |
153 | @@ -701,22 +701,22 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
153 | @@ -705,22 +705,22 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegister | |
154 | 154 | |
155 | 155 | %typemap(csbody_derived) TYPENAME |
156 | 156 | %{ |
180 | 180 | |
181 | 181 | if (obj != null) |
182 | 182 | { |
183 | @@ -981,10 +981,10 @@ COVARIANT_GETID(InitialAssignment) | |
183 | @@ -985,10 +985,10 @@ COVARIANT_GETID(InitialAssignment) | |
184 | 184 | %typemap(csbase) SBMLConstructorException "System.ArgumentException"; |
185 | 185 | %typemap(cscode) SBMLConstructorException |
186 | 186 | %{ |
193 | 193 | } |
194 | 194 | |
195 | 195 | public SBMLConstructorException(string v) : |
196 | @@ -995,10 +995,10 @@ COVARIANT_GETID(InitialAssignment) | |
196 | @@ -999,10 +999,10 @@ COVARIANT_GETID(InitialAssignment) | |
197 | 197 | %typemap(csbase) XMLConstructorException "System.ArgumentException"; |
198 | 198 | %typemap(cscode) XMLConstructorException |
199 | 199 | %{ |
206 | 206 | } |
207 | 207 | |
208 | 208 | public XMLConstructorException(string v) : |
209 | @@ -1037,7 +1037,7 @@ COVARIANT_GETID(InitialAssignment) | |
209 | @@ -1041,7 +1041,7 @@ COVARIANT_GETID(InitialAssignment) | |
210 | 210 | static CustomExceptionDelegate customDelegate = |
211 | 211 | new CustomExceptionDelegate(SetPendingCustomException); |
212 | 212 | |
215 | 215 | public static extern |
216 | 216 | void CustomExceptionRegisterCallback(CustomExceptionDelegate customCallback); |
217 | 217 | |
218 | @@ -1389,8 +1389,8 @@ XMLCONSTRUCTOR_EXCEPTION(XMLTripple) | |
218 | @@ -1393,8 +1393,8 @@ XMLCONSTRUCTOR_EXCEPTION(XMLTripple) | |
219 | 219 | %typemap(cstype) List* _FNAME_ %{ _TYPENAME_ ## List %} |
220 | 220 | %typemap(csout) List* _FNAME_ |
221 | 221 | { |
228 | 228 | { |
229 | 229 | --- a/src/bindings/csharp/local-packages-arrays.i |
230 | 230 | +++ b/src/bindings/csharp/local-packages-arrays.i |
231 | @@ -39,9 +39,9 @@ | |
231 | @@ -43,9 +43,9 @@ | |
232 | 232 | */ |
233 | 233 | %typemap(cscode) ArraysExtension |
234 | 234 | %{ |
240 | 240 | |
241 | 241 | SBasePlugin sbp = new SBasePlugin(cPtr, false); |
242 | 242 | SBase sb = sbp.getParentSBMLObject(); |
243 | @@ -53,9 +53,9 @@ | |
243 | @@ -57,9 +57,9 @@ | |
244 | 244 | } |
245 | 245 | } |
246 | 246 | |
332 | 332 | switch( sb.getTypeCode() ) |
333 | 333 | --- a/src/bindings/csharp/local-packages-req.i |
334 | 334 | +++ b/src/bindings/csharp/local-packages-req.i |
335 | @@ -38,9 +38,9 @@ | |
335 | @@ -42,9 +42,9 @@ | |
336 | 336 | */ |
337 | 337 | %typemap(cscode) ReqExtension |
338 | 338 | %{ |
344 | 344 | |
345 | 345 | SBasePlugin sbp = new SBasePlugin(cPtr, false); |
346 | 346 | SBase sb = sbp.getParentSBMLObject(); |
347 | @@ -53,9 +53,9 @@ | |
347 | @@ -57,9 +57,9 @@ | |
348 | 348 | } |
349 | 349 | } |
350 | 350 | |
358 | 358 | switch( sb.getTypeCode() ) |
359 | 359 | --- a/src/bindings/csharp/local-packages-spatial.i |
360 | 360 | +++ b/src/bindings/csharp/local-packages-spatial.i |
361 | @@ -62,9 +62,9 @@ void SampledField::getUncompressed(int * | |
361 | @@ -68,9 +68,9 @@ void SampledField::getUncompressed(int * | |
362 | 362 | */ |
363 | 363 | %typemap(cscode) SpatialExtension |
364 | 364 | %{ |
370 | 370 | |
371 | 371 | SBasePlugin sbp = new SBasePlugin(cPtr, false); |
372 | 372 | SBase sb = sbp.getParentSBMLObject(); |
373 | @@ -96,9 +96,9 @@ void SampledField::getUncompressed(int * | |
373 | @@ -102,9 +102,9 @@ void SampledField::getUncompressed(int * | |
374 | 374 | } |
375 | 375 | } |
376 | 376 | |
381 | 381 | + if (cPtr.Equals(global::System.IntPtr.Zero)) return null; |
382 | 382 | |
383 | 383 | SBase sb = new SBase(cPtr, false); |
384 | switch( sb.getTypeCode() ) | |
384 | switch ( sb.getTypeCode() ) |