mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

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

Browse source
This commit is contained in:
Nikolaj Bjorner 2012-11-17 18:03:46 -08:00
commit 39e6453f4a
31 changed files with 272 additions and 749 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tactic/tactical.cpp
View file

@ -545,8 +545,13 @@ public:
model_converter_ref & mc,
proof_converter_ref & pc,
expr_dependency_ref & core) {
if (omp_in_parallel()) {
bool use_seq;
#ifdef _NO_OMP_
use_seq = true;
#else
use_seq = omp_in_parallel();
#endif
if (use_seq) {
// execute tasks sequentially
or_else_tactical::operator()(in, result, mc, pc, core);
return;
@ -668,7 +673,13 @@ public:
model_converter_ref & mc,
proof_converter_ref & pc,
expr_dependency_ref & core) {
if (omp_in_parallel()) {
bool use_seq;
#ifdef _NO_OMP_
use_seq = true;
#else
use_seq = omp_in_parallel();
#endif
if (use_seq) {
// execute tasks sequentially
and_then_tactical::operator()(in, result, mc, pc, core);
return;