3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 11:55:51 +00:00

Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api

Resolved  a bunch of Java documentation conflicts

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>

Conflicts:
	src/api/java/AST.java
	src/api/java/ASTMap.java
	src/api/java/ASTVector.java
	src/api/java/AlgebraicNum.java
	src/api/java/BoolExpr.java
	src/api/java/Context.java
	src/api/java/Expr.java
	src/api/java/Fixedpoint.java
	src/api/java/Global.java
	src/api/java/InterpolationContext.java
	src/api/java/Model.java
	src/api/java/Solver.java
This commit is contained in:
Christoph M. Wintersteiger 2015-01-11 18:39:17 +00:00
commit 766d585922
38 changed files with 1326 additions and 2066 deletions

View file

@ -26,6 +26,8 @@ public class BitVecExpr extends Expr
/**
* The size of the sort of a bit-vector term.
* @throws Z3Exception
* @throws Z3Exception on error
* @return an int
**/
public int getSortSize() throws Z3Exception
{
@ -33,7 +35,7 @@ public class BitVecExpr extends Expr
}
/**
* Constructor for BitVecExpr </summary>
* Constructor for BitVecExpr
**/
BitVecExpr(Context ctx, long obj) throws Z3Exception
{