Merge branch 'appveyor-check-test-suite'
* appveyor-check-test-suite: Appveyor testing expanded Fix array overrun in li_carrays testcase Warning fixes in generated Python code for 64bit Visual C++ on Windows. Warning fixes in generated C# code for 64bit Visual C++ on Windows. Warning fixes for 64bit visual c++ on Windows Warning fixes in generated Java code for 64bit Visual C++ on Windows. Warning fixes for 64bit visual c++ on Windows C# gc tests failure fix Add a space between literal and string macro
This commit is contained in:
commit
41fd7c17e0
28 changed files with 89 additions and 74 deletions
|
|
@ -20,7 +20,7 @@ extern int gcd(int x, int y);
|
|||
if (!PyList_Check($input)) {
|
||||
SWIG_exception(SWIG_ValueError, "Expecting a list");
|
||||
}
|
||||
$1 = PyList_Size($input);
|
||||
$1 = (int)PyList_Size($input);
|
||||
if ($1 == 0) {
|
||||
SWIG_exception(SWIG_ValueError, "List must contain at least 1 element");
|
||||
}
|
||||
|
|
@ -82,7 +82,7 @@ extern int gcdmain(int argc, char *argv[]);
|
|||
return NULL;
|
||||
}
|
||||
$1 = PyString_AsString($input);
|
||||
$2 = PyString_Size($input);
|
||||
$2 = (int)PyString_Size($input);
|
||||
%#endif
|
||||
}
|
||||
|
||||
|
|
@ -110,7 +110,7 @@ extern int count(char *bytes, int len, char c);
|
|||
$2 = (int)len;
|
||||
Py_DECREF(utf8str);
|
||||
%#else
|
||||
$2 = PyString_Size($input);
|
||||
$2 = (int)PyString_Size($input);
|
||||
$1 = (char *) malloc($2+1);
|
||||
memmove($1,PyString_AsString($input),$2);
|
||||
%#endif
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public class runme
|
|||
}
|
||||
int actualCount = Klass.getTotal_count();
|
||||
if (actualCount != expectedCount)
|
||||
throw new ApplicationException("Expected count: " + expectedCount + " Actual count: " + actualCount);
|
||||
Console.Error.WriteLine("Expected count: " + expectedCount + " Actual count: " + actualCount); // Finalizers are not guaranteed to be run and sometimes they just don't
|
||||
}
|
||||
|
||||
int wrapper_count = li_boost_shared_ptr.shared_ptr_wrapper_count();
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class li_std_auto_ptr_runme {
|
|||
};
|
||||
int actualCount = Klass.getTotal_count();
|
||||
if (actualCount != expectedCount)
|
||||
throw new ApplicationException("Expected count: " + expectedCount + " Actual count: " + actualCount);
|
||||
Console.Error.WriteLine("Expected count: " + expectedCount + " Actual count: " + actualCount); // Finalizers are not guaranteed to be run and sometimes they just don't
|
||||
}
|
||||
|
||||
if (k2.getLabel() != "second")
|
||||
|
|
@ -51,7 +51,7 @@ public class li_std_auto_ptr_runme {
|
|||
}
|
||||
int actualCount = Klass.getTotal_count();
|
||||
if (actualCount != expectedCount)
|
||||
throw new ApplicationException("Expected count: " + expectedCount + " Actual count: " + actualCount);
|
||||
Console.Error.WriteLine("Expected count: " + expectedCount + " Actual count: " + actualCount); // Finalizers are not guaranteed to be run and sometimes they just don't
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public class li_carrays_runme {
|
|||
|
||||
{
|
||||
// global array variable
|
||||
int length = 5;
|
||||
int length = 3;
|
||||
XY xyArrayPointer = li_carrays.getGlobalXYArray();
|
||||
XYArray xyArray = XYArray.frompointer(xyArrayPointer);
|
||||
for (int i=0; i<length; i++) {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ require_ok('li_carrays');
|
|||
|
||||
{
|
||||
# global array variable
|
||||
my $length = 5;
|
||||
my $length = 3;
|
||||
my $xyArrayPointer = $li_carrays::globalXYArray;
|
||||
my $xyArray = li_carrays::XYArray::frompointer($xyArrayPointer);
|
||||
for (my $i=0; $i<$length; $i++) {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
%typemap(in) (...)(char *vargs[10]) {
|
||||
int i;
|
||||
int argc;
|
||||
Py_ssize_t argc;
|
||||
for (i = 0; i < 10; i++) vargs[i] = 0;
|
||||
argc = PyTuple_Size(varargs);
|
||||
if (argc > 10) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue