diff options
| author | Morgan Deters <mdeters@gmail.com> | 2009-11-24 21:03:35 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2009-11-24 21:03:35 +0000 |
| commit | 811158832b74e3b101af2c7473f4e11a41377dd4 (patch) | |
| tree | 07c55ab126dd7eb24239b615c987a490b182c8a6 /src/include | |
| parent | f6968899de4d27c5bc986c3ac89972fbbe35c361 (diff) | |
configure option adjustments as per 11/24 meeting; various fixes and improvements
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/cvc4_config.h | 3 | ||||
| -rw-r--r-- | src/include/cvc4_expr.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/include/cvc4_config.h b/src/include/cvc4_config.h index e571f5969..ccc07b40a 100644 --- a/src/include/cvc4_config.h +++ b/src/include/cvc4_config.h @@ -39,3 +39,6 @@ # define CVC4_PUBLIC #endif /* __BUILDING_CVC4LIB */ + +#define EXPECT_TRUE(x) __builtin_expect( (x), true) +#define EXPECT_FALSE(x) __builtin_expect( (x), false) diff --git a/src/include/cvc4_expr.h b/src/include/cvc4_expr.h index 36d771647..d99708991 100644 --- a/src/include/cvc4_expr.h +++ b/src/include/cvc4_expr.h @@ -78,6 +78,10 @@ public: Expr substExpr(const std::vector<Expr>& oldTerms, const std::vector<Expr>& newTerms) const; + Expr plusExpr(const Expr& right) const; + Expr uMinusExpr() const; + Expr multExpr(const Expr& right) const; + inline Kind getKind() const; static Expr null() { return s_null; } |