mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-31 11:42:28 +00:00
Code Activity

change names of reserved identifiers. Issue #666

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-07-01 14:46:44 -07:00
parent 654780bb4b
commit 0d0d504d62
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/api/c++/z3++.h
View file

@ -802,8 +802,8 @@ namespace z3 {
friend expr implies(expr const & a, bool b); friend expr implies(expr const & a, bool b);
friend expr implies(bool a, expr const & b); friend expr implies(bool a, expr const & b);
friend expr or(expr_vector const& args); friend expr mk_or(expr_vector const& args);
friend expr and(expr_vector const& args); friend expr mk_and(expr_vector const& args);
friend expr ite(expr const & c, expr const & t, expr const & e); friend expr ite(expr const & c, expr const & t, expr const & e);
@ -1501,13 +1501,13 @@ namespace z3 {
return expr(ctx, r); return expr(ctx, r);
} }
inline expr or(expr_vector const& args) { inline expr mk_or(expr_vector const& args) {
array<Z3_ast> _args(args); array<Z3_ast> _args(args);
Z3_ast r = Z3_mk_or(args.ctx(), _args.size(), _args.ptr()); Z3_ast r = Z3_mk_or(args.ctx(), _args.size(), _args.ptr());
args.check_error(); args.check_error();
return expr(args.ctx(), r); return expr(args.ctx(), r);
} }
inline expr and(expr_vector const& args) { inline expr mk_and(expr_vector const& args) {
array<Z3_ast> _args(args); array<Z3_ast> _args(args);
Z3_ast r = Z3_mk_and(args.ctx(), _args.size(), _args.ptr()); Z3_ast r = Z3_mk_and(args.ctx(), _args.size(), _args.ptr());
args.check_error(); args.check_error();