diff options
Diffstat (limited to 'lib/Expr')
-rw-r--r-- | lib/Expr/Constraints.cpp | 7 | ||||
-rw-r--r-- | lib/Expr/Expr.cpp | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/lib/Expr/Constraints.cpp b/lib/Expr/Constraints.cpp index dbdfd999..1b3ad983 100644 --- a/lib/Expr/Constraints.cpp +++ b/lib/Expr/Constraints.cpp @@ -11,13 +11,10 @@ #include "klee/util/ExprPPrinter.h" #include "klee/util/ExprVisitor.h" -#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 3) +#include "klee/Internal/Module/KModule.h" + #include "llvm/IR/Function.h" -#else -#include "llvm/Function.h" -#endif #include "llvm/Support/CommandLine.h" -#include "klee/Internal/Module/KModule.h" #include <map> diff --git a/lib/Expr/Expr.cpp b/lib/Expr/Expr.cpp index ac50dda2..f73d1614 100644 --- a/lib/Expr/Expr.cpp +++ b/lib/Expr/Expr.cpp @@ -10,9 +10,7 @@ #include "klee/Expr.h" #include "klee/Config/Version.h" -#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 1) #include "llvm/ADT/Hashing.h" -#endif #include "llvm/Support/CommandLine.h" #include "llvm/Support/raw_ostream.h" // FIXME: We shouldn't need this once fast constant support moves into @@ -184,11 +182,7 @@ unsigned Expr::computeHash() { } unsigned ConstantExpr::computeHash() { -#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 1) hashValue = hash_value(value) ^ (getWidth() * MAGIC_HASH_CONSTANT); -#else - hashValue = value.getHashValue() ^ (getWidth() * MAGIC_HASH_CONSTANT); -#endif return hashValue; } |