build

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/api/ml/z3.ml

@@ -263,8 +263,8 @@ sig
   end
   val mk_func_decl : context -> Symbol.symbol -> Sort.sort list -> Sort.sort -> func_decl
   val mk_func_decl_s : context -> string -> Sort.sort list -> Sort.sort -> func_decl
-  val mk_rec_fun : context -> Symbol.symbol -> Sort.sort list -> Sort.sort -> func_decl
+  val mk_rec_func_decl : context -> Symbol.symbol -> Sort.sort list -> Sort.sort -> func_decl
-  val mk_rec_fun_s : context -> string -> Sort.sort list -> Sort.sort -> func_decl
+  val mk_rec_func_decl_s : context -> string -> Sort.sort list -> Sort.sort -> func_decl
   val add_rec_def : context -> func_decl -> Expr.expr list -> Expr.expr -> unit
   val mk_fresh_func_decl : context -> string -> Sort.sort list -> Sort.sort -> func_decl
   val mk_const_decl : context -> Symbol.symbol -> Sort.sort -> func_decl
@@ -341,11 +341,11 @@ end = struct
   let mk_func_decl_s (ctx:context) (name:string) (domain:Sort.sort list) (range:Sort.sort) =
     mk_func_decl ctx (Symbol.mk_string ctx name) domain range
 
-  let mk_rec_fun (ctx:context) (name:Symbol.symbol) (domain:Sort.sort list) (range:Sort.sort) =
+  let mk_rec_func_decl (ctx:context) (name:Symbol.symbol) (domain:Sort.sort list) (range:Sort.sort) =
-    Z3native.mk_rec_fun ctx name (List.length domain) domain range
+    Z3native.mk_rec_func_decl ctx name (List.length domain) domain range
 
-  let mk_rec_fun_s (ctx:context) (name:string) (domain:Sort.sort list) (range:Sort.sort) =
+  let mk_rec_func_decl_s (ctx:context) (name:string) (domain:Sort.sort list) (range:Sort.sort) =
-    mk_rec_fun ctx (Symbol.mk_string ctx name) domain range
+    mk_rec_func_decl ctx (Symbol.mk_string ctx name) domain range
 
   let add_rec_def (ctx:context) (f:func_decl) (args:Expr.expr list) (body:Expr.expr) =
     Z3native.add_rec_def ctx f (List.length args) args body

src/api/ml/z3.mli

@@ -329,11 +329,11 @@ sig
 
   (** Creates a function declaration that can be used in a recursive function definition.
       {!add_rec_def} *)
-  val mk_rec_fun : context -> Symbol.symbol -> Sort.sort list -> Sort.sort -> func_decl
+  val mk_rec_func_decl : context -> Symbol.symbol -> Sort.sort list -> Sort.sort -> func_decl
 
   (** Creates a function declaration that can be used in a recursive function definition.
       {!add_rec_def} *)
-  val mk_rec_fun_s : context -> string -> Sort.sort list -> Sort.sort -> func_decl
+  val mk_rec_func_decl_s : context -> string -> Sort.sort list -> Sort.sort -> func_decl
 
   (** Registers a recursive function definition *)
   val add_rec_def : context -> func_decl -> Expr.expr list -> Expr.expr -> unit

src/util/memory_manager.h

@@ -16,14 +16,14 @@ Author:
 Revision History:
 
 --*/
-#ifndef MEMORY_H_
+#pragma once
 
 #include<cstdlib>
 #include<ostream>
 #include "util/z3_exception.h"
 
-#pragma once
+#ifndef __has_builtin
-# define __has_builtin(x) 0
+#define __has_builtin(x) 0
 #endif