From 1d340f62096b69c3161367ab9b4cdde1e1f8c443 Mon Sep 17 00:00:00 2001 From: Soonho Kong Date: Tue, 5 May 2015 16:40:22 -0400 Subject: [PATCH] fix: use Int64 for opensmt_mk_int_var --- src/expression.jl | 8 ++++---- src/wrap_capi.jl | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/expression.jl b/src/expression.jl index 6c9a450..a508f6c 100644 --- a/src/expression.jl +++ b/src/expression.jl @@ -10,11 +10,11 @@ end Var(ctx::Context, T::Type{Float64}, name::ASCIIString, lb::Float64, ub::Float64) = Ex{T}(opensmt_mk_real_var(ctx.ctx, name, lb, ub)) Var(ctx::Context, T::Type{Int64}, name::ASCIIString, lb::Int32, ub::Int32) = - Ex{T}(opensmt_mk_int_var(ctx.ctx, name, lb, ub)) + Ex{T}(opensmt_mk_int_var(ctx.ctx, name, Int64(lb), Int64(ub))) Var(ctx::Context, T::Type{Int64}, name::ASCIIString, lb::Int64, ub::Int64) = - @compat Ex{T}(opensmt_mk_int_var(ctx.ctx, name, Int32(lb), Int32(ub))) + @compat Ex{T}(opensmt_mk_int_var(ctx.ctx, name, lb, ub)) Var(ctx::Context, T::Type{Int64}, name::ASCIIString) = - Ex{T}(opensmt_mk_int_var(ctx.ctx, name, typemin(Cint), typemax(Cint))) + Ex{T}(opensmt_mk_int_var(ctx.ctx, name, typemin(Int64), typemax(Int64))) Var(ctx::Context,T::Type{Bool}, name::ASCIIString) = Ex{T}(opensmt_mk_bool_var(ctx.ctx, name)) @@ -24,4 +24,4 @@ Var(T, name::ASCIIString) = Var(global_context(), T, name) ## Printing ## ======== -print(io::IO, e::Ex) = opensmt_print_expr(e.e) \ No newline at end of file +print(io::IO, e::Ex) = opensmt_print_expr(e.e) diff --git a/src/wrap_capi.jl b/src/wrap_capi.jl index 1d26cae..67670ef 100644 --- a/src/wrap_capi.jl +++ b/src/wrap_capi.jl @@ -102,9 +102,9 @@ opensmt_mk_real_var(ctx::opensmt_context, varname::ASCIIString, lb::Float64, ub: ccall((:opensmt_mk_real_var, "libdreal"), Ptr{Void}, (Ptr{Void}, Ptr{UInt8}, Float64, Float64), ctx, varname, lb, ub) -opensmt_mk_int_var(ctx::opensmt_context, varname::ASCIIString, lb::Cint, ub::Cint) = +opensmt_mk_int_var(ctx::opensmt_context, varname::ASCIIString, lb::Int64, ub::Int64) = ccall((:opensmt_mk_int_var, "libdreal"), Ptr{Void}, - (Ptr{Void}, Ptr{UInt8}, Cint, Cint), ctx, varname, lb, ub) + (Ptr{Void}, Ptr{UInt8}, Int64, Int64), ctx, varname, lb, ub) opensmt_mk_cost_var(ctx::opensmt_context, varname::Ptr{UInt8}) = ccall((:opensmt_mk_cost_var, "libdreal"), Ptr{Void}, (Ptr{Void}, Ptr{UInt8}), ctx, varname) @@ -207,4 +207,4 @@ opensmt_mk_tanh(ctx::opensmt_context, e::opensmt_expr) = ccall((:opensmt_mk_tanh, "libdreal"), Ptr{Void}, (Ptr{Void}, Ptr{Void}), ctx, e) opensmt_mk_atan2(ctx::opensmt_context, e::opensmt_expr) = - ccall((:opensmt_mk_atan2, "libdreal"), Ptr{Void}, (Ptr{Void}, Ptr{Void}), ctx, e) \ No newline at end of file + ccall((:opensmt_mk_atan2, "libdreal"), Ptr{Void}, (Ptr{Void}, Ptr{Void}), ctx, e)