diff options
| author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2013-08-28 14:00:36 +0100 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2013-08-28 14:00:36 +0100 |
| commit | c7874f2ad92a9f26430038f7a9426dec1fe632ea (patch) | |
| tree | 36f8ee7e39294978134d70ef5f8384380a14cde2 /include | |
| parent | 821b6f6473334eaa6c78205603faf14a2c1aca41 (diff) | |
| parent | 6c445f2b1a1f91ffb301bece325dd5a491922ce1 (diff) | |
| download | klee-c7874f2ad92a9f26430038f7a9426dec1fe632ea.tar.gz | |
Merge branch 'CompilerWarnings' of https://github.com/MartinNowack/klee into MartinNowack-CompilerWarnings
Diffstat (limited to 'include')
| -rw-r--r-- | include/klee/Expr.h | 2 | ||||
| -rw-r--r-- | include/klee/Internal/ADT/MapOfSets.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/klee/Expr.h b/include/klee/Expr.h index 9d170dc5..4bebd521 100644 --- a/include/klee/Expr.h +++ b/include/klee/Expr.h @@ -364,7 +364,7 @@ public: virtual ref<Expr> rebuild(ref<Expr> kids[]) const { assert(0 && "rebuild() on ConstantExpr"); - return (Expr*) this; + return const_cast<ConstantExpr*>(this); } virtual unsigned computeHash(); diff --git a/include/klee/Internal/ADT/MapOfSets.h b/include/klee/Internal/ADT/MapOfSets.h index 25c5e2b9..c7568577 100644 --- a/include/klee/Internal/ADT/MapOfSets.h +++ b/include/klee/Internal/ADT/MapOfSets.h @@ -345,7 +345,6 @@ namespace klee { if (res) return res; } } else { - typename Node::children_ty::iterator kbegin = n->children.begin(); typename Node::children_ty::iterator kmid = n->children.lower_bound(*begin); for (typename Node::children_ty::iterator it = n->children.begin(), |