From 564343c39cb37359eff7fd848f78ae652dace20b Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Tue, 9 Feb 2016 15:30:05 +0000 Subject: [PATCH 1/3] remove unused methods in ast.cpp --- src/ast/ast.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ast/ast.h b/src/ast/ast.h index 0dba6039c..861fb997d 100644 --- a/src/ast/ast.h +++ b/src/ast/ast.h @@ -634,9 +634,6 @@ struct app_flags { unsigned m_ground:1; // application does not have free variables or nested quantifiers. unsigned m_has_quantifiers:1; // application has nested quantifiers. unsigned m_has_labels:1; // application has nested labels. - static app_flags mk_const_flags(); - static app_flags mk_default_app_flags(); - static app_flags mk_default_quantifier_flags(); }; class app : public expr { From 3df9fea54c92a2c74fba64f629836a1f486ade38 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Tue, 9 Feb 2016 16:38:35 +0000 Subject: [PATCH 2/3] removed unused variables --- src/api/api_fpa.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/api/api_fpa.cpp b/src/api/api_fpa.cpp index 33c1448e7..37197e730 100644 --- a/src/api/api_fpa.cpp +++ b/src/api/api_fpa.cpp @@ -935,7 +935,6 @@ extern "C" { RESET_ERROR_CODE(); ast_manager & m = mk_c(c)->m(); mpf_manager & mpfm = mk_c(c)->fpautil().fm(); - unsynch_mpz_manager & mpzm = mpfm.mpz_manager(); unsynch_mpq_manager & mpqm = mpfm.mpq_manager(); family_id fid = mk_c(c)->get_fpa_fid(); fpa_decl_plugin * plugin = (fpa_decl_plugin*)m.get_plugin(fid); @@ -1037,7 +1036,6 @@ extern "C" { RESET_ERROR_CODE(); ast_manager & m = mk_c(c)->m(); mpf_manager & mpfm = mk_c(c)->fpautil().fm(); - unsynch_mpz_manager & mpzm = mpfm.mpz_manager(); family_id fid = mk_c(c)->get_fpa_fid(); fpa_decl_plugin * plugin = (fpa_decl_plugin*)m.get_plugin(mk_c(c)->get_fpa_fid()); SASSERT(plugin != 0); From a16f524eae61a4f6cb49cc43318242a5d550c453 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Tue, 9 Feb 2016 19:58:52 +0000 Subject: [PATCH 3/3] Install target fix for ocamlfind_install on Windows. Relates to #409 --- scripts/mk_util.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/mk_util.py b/scripts/mk_util.py index 53f891d28..33f70c98d 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -3650,10 +3650,15 @@ class MakeRuleCmd(object): assert not ' ' in dir install_root = cls._install_root(dir, in_prefix, out) - cls.write_cmd(out, "mkdir -p {install_root}{dir}".format( - install_root=install_root, - dir=dir)) - + if is_windows(): + cls.write_cmd(out, "IF NOT EXIST {dir} (mkdir {dir})".format( + install_root=install_root, + dir=dir)) + else: + cls.write_cmd(out, "mkdir -p {install_root}{dir}".format( + install_root=install_root, + dir=dir)) + @classmethod def _is_path_prefix_of(cls, temp_path, target_as_abs): """