mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-31 23:34:55 +00:00
Code Activity

Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt

Browse source 
Conflicts:
	scripts/mk_project.py
	src/duality/duality.h
	src/duality/duality_solver.cpp
	src/duality/duality_wrapper.h
	src/interp/iz3hash.h

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
Christoph M. Wintersteiger 2014-04-25 22:18:41 +01:00
commit c3b7c738f8
35 changed files with 11884 additions and 11582 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/interp/iz3hash.h
View file

@ -464,7 +464,9 @@ namespace hash_space {
Value &operator[](const Key& key) {
std::pair<Key,Value> kvp(key,Value());
return this->lookup(kvp,true)->val.second;
return
hashtable<std::pair<Key,Value>,Key,HashFun,proj1<Key,Value>,EqFun>::
lookup(kvp,true)->val.second;
}
};