jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ancient bad merge from trunk

Browse source
This commit is contained in:
William S Fulton 2014-06-23 19:38:06 +01:00
commit daab0d748c
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/test-suite/special_variable_macros.i
View file

@ -127,7 +127,7 @@ const char * testJames(Name *james) {
%{ %{
/*%typemap(in) (Name *multiname, int num) start */ /*%typemap(in) (Name *multiname, int num) start */
temp_name = $*1_ltype("multiname num"); temp_name = $*1_ltype("multiname num");
temp_count = strlen(temp_name.getNamePtr()->getName()); temp_count = (int)strlen(temp_name.getNamePtr()->getName());
(void)$input; (void)$input;
$1 = temp_name.getNamePtr(); $1 = temp_name.getNamePtr();
$2 = temp_count + 100; $2 = temp_count + 100;
@ -142,7 +142,7 @@ $typemap(in, (Name *multiname, int num))
%inline %{ %inline %{
const char * testJim(Name *jim, int count) { const char * testJim(Name *jim, int count) {
if (count != strlen(jim->getNamePtr()->getName()) + 100) if (count != (int)strlen(jim->getNamePtr()->getName()) + 100)
return "size check failed"; return "size check failed";
else else
return jim->getName(); return jim->getName();