mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-05 21:53:23 +00:00
Code Activity

fix VS build, take 2

Browse source
This commit is contained in:
Nuno Lopes 2019-02-21 15:52:52 +00:00
parent 3d7878bafc
commit 6598aedbb2
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/sat/sat_solver.cpp
View file

@ -27,6 +27,9 @@ Revision History:
#include "util/trace.h" #include "util/trace.h"
#include "util/max_cliques.h" #include "util/max_cliques.h"
#include "util/gparams.h" #include "util/gparams.h"
#ifdef _MSC_VER
# include <xmmintrin.h>
#endif
// define to update glue during propagation // define to update glue during propagation
#define UPDATE_GLUE #define UPDATE_GLUE

1
src/util/CMakeLists.txt
View file

@ -56,7 +56,6 @@ z3_add_component(util
symbol.cpp symbol.cpp
timeit.cpp timeit.cpp
timeout.cpp timeout.cpp
timer.cpp
trace.cpp trace.cpp
util.cpp util.cpp
warning.cpp warning.cpp

11
src/util/stopwatch.h
View file

@ -25,14 +25,17 @@ Revision History:
class stopwatch class stopwatch
{ {
std::chrono::time_point<std::chrono::steady_clock> m_start; typedef decltype(std::chrono::steady_clock::now()) clock_t;
std::chrono::steady_clock::duration m_elapsed; typedef decltype(std::chrono::steady_clock::now() - std::chrono::steady_clock::now()) duration_t;
clock_t m_start;
duration_t m_elapsed;
#if Z3DEBUG #if Z3DEBUG
bool m_running = false; bool m_running = false;
#endif #endif
// FIXME: just use auto with VS 2015+ // FIXME: just use auto with VS 2015+
static decltype(std::chrono::steady_clock::now()) get() { static clock_t get() {
return std::chrono::steady_clock::now(); return std::chrono::steady_clock::now();
} }
@ -46,7 +49,7 @@ public:
} }
void reset() { void reset() {
m_elapsed = std::chrono::steady_clock::duration::zero(); m_elapsed = duration_t::zero();
} }
void start() { void start() {