diff --git a/src/muz/base/dl_util.cpp b/src/muz/base/dl_util.cpp index 7cc9d4b03..2dbf844a8 100644 --- a/src/muz/base/dl_util.cpp +++ b/src/muz/base/dl_util.cpp @@ -622,7 +622,7 @@ namespace datalog { } bool string_to_uint64(const char * s, uint64_t & res) { -#if _WINDOWS +#if 1 int converted = sscanf_s(s, "%I64u", &res); #else int converted = sscanf(s, "%llu", &res); diff --git a/src/smt/theory_str.cpp b/src/smt/theory_str.cpp index 60b365d20..0f9d42b3d 100644 --- a/src/smt/theory_str.cpp +++ b/src/smt/theory_str.cpp @@ -10130,10 +10130,11 @@ namespace smt { // increment LengthAttemptCount regex_inc_counter(regex_length_attempt_count, re); - { - unsigned v = regex_get_counter(regex_length_attempt_count, re); - TRACE("str", tout << "length attempt count for " << mk_pp(re, m) << " is " << v << std::endl;); - } + TRACE("str", + { + unsigned v = regex_get_counter(regex_length_attempt_count, re); + tout << "length attempt count for " << mk_pp(re, m) << " is " << v << std::endl; + }); continue; } @@ -10541,11 +10542,12 @@ namespace smt { continue; } - { - unsigned v = regex_get_counter(regex_length_attempt_count, aut.get_regex_term()); - TRACE("str", tout << "length attempt count of " << mk_pp(aut.get_regex_term(), m) << " is " << v - << ", threshold is " << m_params.m_RegexAutomata_LengthAttemptThreshold << std::endl;); - } + TRACE("str", + { + unsigned v = regex_get_counter(regex_length_attempt_count, aut.get_regex_term()); + tout << "length attempt count of " << mk_pp(aut.get_regex_term(), m) << " is " << v + << ", threshold is " << m_params.m_RegexAutomata_LengthAttemptThreshold << std::endl; + }); if (regex_get_counter(regex_length_attempt_count, aut.get_regex_term()) >= m_params.m_RegexAutomata_LengthAttemptThreshold) { unsigned intersectionDifficulty = estimate_automata_intersection_difficulty(aut_inter, aut.get_automaton());