mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-19 20:33:38 +00:00
Code Activity

Merge branch 'master' of https://github.com/Z3Prover/z3

Browse source
This commit is contained in:
Nikolaj Bjorner 2015-12-07 15:01:56 -08:00
commit d9fee9af1e
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/mk_util.py
View file

@ -1349,7 +1349,7 @@ class PythonInstallComponent(Component):
return False return False
def install_deps(self, out): def install_deps(self, out):
if not is_python_install_enabled(): if not is_python_install_enabled():
return return
pythonPkgDirWithoutPrefix = strip_path_prefix(PYTHON_PACKAGE_DIR, PREFIX) pythonPkgDirWithoutPrefix = strip_path_prefix(PYTHON_PACKAGE_DIR, PREFIX)
MakeRuleCmd.make_install_directory(out, pythonPkgDirWithoutPrefix) MakeRuleCmd.make_install_directory(out, pythonPkgDirWithoutPrefix)

5
src/api/api_fpa.cpp
View file

@ -441,8 +441,9 @@ extern "C" {
LOG_Z3_mk_fpa_max(c, t1, t2); LOG_Z3_mk_fpa_max(c, t1, t2);
RESET_ERROR_CODE(); RESET_ERROR_CODE();
api::context * ctx = mk_c(c); api::context * ctx = mk_c(c);
Z3_ast r = of_ast(ctx->fpautil().mk_max(to_expr(t1), to_expr(t2))); expr * a = ctx->fpautil().mk_max(to_expr(t1), to_expr(t2));
RETURN_Z3(r); ctx->save_ast_trail(a);
RETURN_Z3(of_expr(a));
Z3_CATCH_RETURN(0); Z3_CATCH_RETURN(0);
} }