From 0d0d504d62735616bf38c8b2671ea91d68fb5fd2 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Fri, 1 Jul 2016 14:46:44 -0700 Subject: [PATCH] change names of reserved identifiers. Issue #666 Signed-off-by: Nikolaj Bjorner --- src/api/c++/z3++.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/c++/z3++.h b/src/api/c++/z3++.h index 98a1a76ea..e0c520f5b 100644 --- a/src/api/c++/z3++.h +++ b/src/api/c++/z3++.h @@ -802,8 +802,8 @@ namespace z3 { friend expr implies(expr const & a, bool b); friend expr implies(bool a, expr const & b); - friend expr or(expr_vector const& args); - friend expr and(expr_vector const& args); + friend expr mk_or(expr_vector const& args); + friend expr mk_and(expr_vector const& args); friend expr ite(expr const & c, expr const & t, expr const & e); @@ -1501,13 +1501,13 @@ namespace z3 { return expr(ctx, r); } - inline expr or(expr_vector const& args) { + inline expr mk_or(expr_vector const& args) { array _args(args); Z3_ast r = Z3_mk_or(args.ctx(), _args.size(), _args.ptr()); args.check_error(); return expr(args.ctx(), r); } - inline expr and(expr_vector const& args) { + inline expr mk_and(expr_vector const& args) { array _args(args); Z3_ast r = Z3_mk_and(args.ctx(), _args.size(), _args.ptr()); args.check_error();