wrap gen: don't wrap in pointer() Ptr{FILE} arg

it has a special meaning that pointer() does not support

Author: alyst

src/cvode.jl

@@ -16,7 +16,7 @@ function __CVodeSetErrFile(cvode_mem::CVODEMemPtr,errfp::Ptr{FILE})
     ccall((:CVodeSetErrFile,libsundials_cvode),Cint,(CVODEMemPtr,Ptr{FILE}),cvode_mem,errfp)
 end
 
-CVodeSetErrFile(cvode_mem,errfp) = __CVodeSetErrFile(convert(CVODEMemPtr,cvode_mem),pointer(errfp))
+CVodeSetErrFile(cvode_mem,errfp) = __CVodeSetErrFile(convert(CVODEMemPtr,cvode_mem),errfp)
 
 function __CVodeSetUserData(cvode_mem::CVODEMemPtr,user_data::Any)
     ccall((:CVodeSetUserData,libsundials_cvode),Cint,(CVODEMemPtr,Any),cvode_mem,user_data)

src/cvodes.jl

@@ -166,7 +166,7 @@ function __CVodeSetErrFile(cvode_mem::CVODEMemPtr,errfp::Ptr{FILE})
     ccall((:CVodeSetErrFile,libsundials_cvodes),Cint,(CVODEMemPtr,Ptr{FILE}),cvode_mem,errfp)
 end
 
-CVodeSetErrFile(cvode_mem,errfp) = __CVodeSetErrFile(convert(CVODEMemPtr,cvode_mem),pointer(errfp))
+CVodeSetErrFile(cvode_mem,errfp) = __CVodeSetErrFile(convert(CVODEMemPtr,cvode_mem),errfp)
 
 function __CVodeSetUserData(cvode_mem::CVODEMemPtr,user_data::Any)
     ccall((:CVodeSetUserData,libsundials_cvodes),Cint,(CVODEMemPtr,Any),cvode_mem,user_data)

src/ida.jl

@@ -16,7 +16,7 @@ function __IDASetErrFile(ida_mem::IDAMemPtr,errfp::Ptr{FILE})
     ccall((:IDASetErrFile,libsundials_ida),Cint,(IDAMemPtr,Ptr{FILE}),ida_mem,errfp)
 end
 
-IDASetErrFile(ida_mem,errfp) = __IDASetErrFile(convert(IDAMemPtr,ida_mem),pointer(errfp))
+IDASetErrFile(ida_mem,errfp) = __IDASetErrFile(convert(IDAMemPtr,ida_mem),errfp)
 
 function __IDASetUserData(ida_mem::IDAMemPtr,user_data::Any)
     ccall((:IDASetUserData,libsundials_ida),Cint,(IDAMemPtr,Any),ida_mem,user_data)

src/idas.jl

@@ -16,7 +16,7 @@ function __IDASetErrFile(ida_mem::IDAMemPtr,errfp::Ptr{FILE})
     ccall((:IDASetErrFile,libsundials_idas),Cint,(IDAMemPtr,Ptr{FILE}),ida_mem,errfp)
 end
 
-IDASetErrFile(ida_mem,errfp) = __IDASetErrFile(convert(IDAMemPtr,ida_mem),pointer(errfp))
+IDASetErrFile(ida_mem,errfp) = __IDASetErrFile(convert(IDAMemPtr,ida_mem),errfp)
 
 function __IDASetUserData(ida_mem::IDAMemPtr,user_data::Any)
     ccall((:IDASetUserData,libsundials_idas),Cint,(IDAMemPtr,Any),ida_mem,user_data)

src/kinsol.jl

@@ -16,7 +16,7 @@ function __KINSetErrFile(kinmem::KINMemPtr,errfp::Ptr{FILE})
     ccall((:KINSetErrFile,libsundials_kinsol),Cint,(KINMemPtr,Ptr{FILE}),kinmem,errfp)
 end
 
-KINSetErrFile(kinmem,errfp) = __KINSetErrFile(convert(KINMemPtr,kinmem),pointer(errfp))
+KINSetErrFile(kinmem,errfp) = __KINSetErrFile(convert(KINMemPtr,kinmem),errfp)
 
 function __KINSetInfoHandlerFn(kinmem::KINMemPtr,ihfun::KINInfoHandlerFn,ih_data::Ptr{Void})
     ccall((:KINSetInfoHandlerFn,libsundials_kinsol),Cint,(KINMemPtr,KINInfoHandlerFn,Ptr{Void}),kinmem,ihfun,ih_data)
@@ -28,7 +28,7 @@ function __KINSetInfoFile(kinmem::KINMemPtr,infofp::Ptr{FILE})
     ccall((:KINSetInfoFile,libsundials_kinsol),Cint,(KINMemPtr,Ptr{FILE}),kinmem,infofp)
 end
 
-KINSetInfoFile(kinmem,infofp) = __KINSetInfoFile(convert(KINMemPtr,kinmem),pointer(infofp))
+KINSetInfoFile(kinmem,infofp) = __KINSetInfoFile(convert(KINMemPtr,kinmem),infofp)
 
 function __KINSetUserData(kinmem::KINMemPtr,user_data::Any)
     ccall((:KINSetUserData,libsundials_kinsol),Cint,(KINMemPtr,Any),kinmem,user_data)

src/wrap_sundials.jl

@@ -156,7 +156,8 @@ function typeify_sundials_pointers(expr::Expr)
                                     if expr.args[2] == :N_Vector || ismatch(r"MemPtr$", string(expr.args[2]))
                                         # convert(XXXMemPtr, mem)
                                         Expr(:call, :convert, expr.args[2], expr.args[1])
-                                    elseif isa(expr.args[2], Expr) && expr.args[2].head == :curly && expr.args[2].args[1] == :Ptr
+                                    elseif isa(expr.args[2], Expr) && expr.args[2].head == :curly &&
+                                        expr.args[2].args[1] == :Ptr && expr.args[2].args[2] != :FILE
                                         # convert julia arrays to pointer
                                         # FIXME sometimes these arguments are not really arrays, but just a pointer to a var to be assigned
                                         # by the function call. Does that make sense to detect such cases and assume that input arg is a reference to Julia var?