diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 078bec76d..60cf35dcd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -182,7 +182,7 @@ jobs: - script: brew install ninja - script: brew cask install julia - script: | - julia -e "using Pkg; Pkg.add(PackageSpec(name=\"libcxxwrap_julia_jll\", version=\"0.6.6\"))" + julia -e "using Pkg; Pkg.add(PackageSpec(name=\"libcxxwrap_julia_jll\", version=\"0.7.0\"))" JlCxxDir=$(julia -e "using libcxxwrap_julia_jll; println(joinpath(dirname(libcxxwrap_julia_jll.libcxxwrap_julia_path), \"cmake\", \"JlCxx\"))") set -e mkdir build diff --git a/src/api/julia/z3jl.cpp b/src/api/julia/z3jl.cpp index 0877cc3cd..8cb96abec 100644 --- a/src/api/julia/z3jl.cpp +++ b/src/api/julia/z3jl.cpp @@ -97,8 +97,8 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &m) TYPE_OBJ(config) .method("set", static_cast(&config::set)) - .method("set", [](config &a, char const *b, const jlcxx::StrictlyTypedNumber &c) { return a.set(b, c.value); }) - .method("set", [](config &a, char const *b, const jlcxx::StrictlyTypedNumber &c) { return a.set(b, c.value); }); + .method("set", static_cast(&config::set)) + .method("set", static_cast(&config::set)); // ------------------------------------------------------------------------- @@ -377,8 +377,8 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &m) .method("set", static_cast(&solver::set)) .method("set", static_cast(&solver::set)) .method("set", static_cast(&solver::set)) - .method("set", [](solver &a, char const *b, const jlcxx::StrictlyTypedNumber &c) { return a.set(b, c.value); }) - .method("set", [](solver &a, char const *b, const jlcxx::StrictlyTypedNumber &c) { return a.set(b, c.value); }) + .method("set", static_cast(&solver::set)) + .method("set", static_cast(&solver::set)) .MM(solver, push) .MM(solver, pop) .MM(solver, reset) @@ -475,8 +475,8 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &m) TYPE_OBJ(params) .constructor() - .method("set", [](params &a, char const *b, const jlcxx::StrictlyTypedNumber &c) { return a.set(b, c.value); }) - .method("set", [](params &a, char const *b, const jlcxx::StrictlyTypedNumber &c) { return a.set(b, c.value); }) + .method("set", static_cast(¶ms::set)) + .method("set", static_cast(¶ms::set)) .method("set", static_cast(¶ms::set)) .method("set", static_cast(¶ms::set)) .method("set", static_cast(¶ms::set)) @@ -591,9 +591,9 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &m) // ------------------------------------------------------------------------- - m.method("set_param", [](char const *a, const jlcxx::StrictlyTypedNumber &b) { return set_param(a, b.value); }); - m.method("set_param", [](char const *a, const jlcxx::StrictlyTypedNumber &b) { return set_param(a, b.value); }); - m.method("set_param", static_cast(&set_param)); + m.method("set_param", static_cast(&set_param)); + m.method("set_param", static_cast(&set_param)); + m.method("set_param", static_cast(&set_param)); m.method("reset_params", &reset_params); // ------------------------------------------------------------------------- @@ -601,8 +601,8 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &m) TYPE_OBJ(context) .constructor() .method("set", static_cast(&context::set)) - .method("set", [](context &a, char const *b, const jlcxx::StrictlyTypedNumber &c) { return a.set(b, c.value); }) - .method("set", [](context &a, char const *b, const jlcxx::StrictlyTypedNumber &c) { return a.set(b, c.value); }) + .method("set", static_cast(&context::set)) + .method("set", static_cast(&context::set)) // .MM(context, interrupt) // @@ -681,23 +681,23 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &m) // .MM(context, bool_val) // - .method("int_val", [](context &a, const jlcxx::StrictlyTypedNumber &b) { return a.int_val(b.value); }) - .method("int_val", [](context &a, const jlcxx::StrictlyTypedNumber &b) { return a.int_val(b.value); }) - .method("int_val", [](context &a, const jlcxx::StrictlyTypedNumber &b) { return a.int_val(b.value); }) - .method("int_val", [](context &a, const jlcxx::StrictlyTypedNumber &b) { return a.int_val(b.value); }) + .method("int_val", [](context &a, const jlcxx::StrictlyTypedNumber b) { return a.int_val(b.value); }) + .method("int_val", [](context &a, const jlcxx::StrictlyTypedNumber b) { return a.int_val(b.value); }) + .method("int_val", [](context &a, const jlcxx::StrictlyTypedNumber b) { return a.int_val(b.value); }) + .method("int_val", [](context &a, const jlcxx::StrictlyTypedNumber b) { return a.int_val(b.value); }) .method("int_val", static_cast(&context::int_val)) // - .method("real_val", [](context &a, const jlcxx::StrictlyTypedNumber &b) { return a.real_val(b.value); }) - .method("real_val", [](context &a, const jlcxx::StrictlyTypedNumber &b) { return a.real_val(b.value); }) - .method("real_val", [](context &a, const jlcxx::StrictlyTypedNumber &b) { return a.real_val(b.value); }) - .method("real_val", [](context &a, const jlcxx::StrictlyTypedNumber &b) { return a.real_val(b.value); }) + .method("real_val", [](context &a, const jlcxx::StrictlyTypedNumber b) { return a.real_val(b.value); }) + .method("real_val", [](context &a, const jlcxx::StrictlyTypedNumber b) { return a.real_val(b.value); }) + .method("real_val", [](context &a, const jlcxx::StrictlyTypedNumber b) { return a.real_val(b.value); }) + .method("real_val", [](context &a, const jlcxx::StrictlyTypedNumber b) { return a.real_val(b.value); }) .method("real_val", static_cast(&context::real_val)) .method("real_val", static_cast(&context::real_val)) // - .method("bv_val", [](context &a, const jlcxx::StrictlyTypedNumber &b, const jlcxx::StrictlyTypedNumber &c) { return a.bv_val(b.value, c.value); }) - .method("bv_val", [](context &a, const jlcxx::StrictlyTypedNumber &b, const jlcxx::StrictlyTypedNumber &c) { return a.bv_val(b.value, c.value); }) - .method("bv_val", [](context &a, const jlcxx::StrictlyTypedNumber &b, const jlcxx::StrictlyTypedNumber &c) { return a.bv_val(b.value, c.value); }) - .method("bv_val", [](context &a, const jlcxx::StrictlyTypedNumber &b, const jlcxx::StrictlyTypedNumber &c) { return a.bv_val(b.value, c.value); }) + .method("bv_val", [](context &a, const jlcxx::StrictlyTypedNumber b, unsigned c) { return a.bv_val(b.value, c); }) + .method("bv_val", [](context &a, const jlcxx::StrictlyTypedNumber b, unsigned c) { return a.bv_val(b.value, c); }) + .method("bv_val", [](context &a, const jlcxx::StrictlyTypedNumber b, unsigned c) { return a.bv_val(b.value, c); }) + .method("bv_val", [](context &a, const jlcxx::StrictlyTypedNumber b, unsigned c) { return a.bv_val(b.value, c); }) .method("bv_val", static_cast(&context::bv_val)) .method("bv_val", static_cast(&context::bv_val)) //