fix build

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/sat/ba_solver.h

@@ -242,10 +242,10 @@ namespace sat {
         unsigned_vector   m_pb_undef;
 
         struct ba_sort {
-            ba_solver& s;
             typedef typename sat::literal literal;
             typedef typename sat::literal_vector literal_vector;
 
+            ba_solver& s;
             literal m_true;
             literal_vector m_lits;
             

src/sat/sat_allocator.h

@@ -90,6 +90,8 @@ public:
         }
     }
     size_t get_allocation_size() const { return m_alloc_size; }
+
+    char const* id() const { return m_id; }
 };
 
 inline void * operator new(size_t s, sat_allocator & r) { return r.allocate(s); }

src/sat/sat_solver.cpp

@@ -38,9 +38,9 @@ namespace sat {
         m_config(p),
         m_par(nullptr),
         m_cls_allocator_idx(false),
-        m_par_syncing_clauses(false),
-        m_par_id(0),
         m_cleaner(*this),
+        m_par_id(0),
+        m_par_syncing_clauses(false),
         m_simplifier(*this, p),
         m_scc(*this, p),
         m_asymm_branch(*this, p),
@@ -487,8 +487,6 @@ namespace sat {
         return reinit;
     }
 
-    static unsigned s_count = 0;
-
     void solver::attach_clause(clause & c, bool & reinit) {
         SASSERT(c.size() > 2);
         reinit = false;
@@ -1332,7 +1330,6 @@ namespace sat {
                 next = m_case_split_queue.min_var();
                 auto age = m_stats.m_conflict - m_canceled[next];
                 while (age > 0) {
-                    double decay = pow(0.95, age);
                     m_activity[next] = static_cast<unsigned>(m_activity[next] * pow(0.95, age));
                     m_case_split_queue.activity_changed_eh(next, false);
                     m_canceled[next] = m_stats.m_conflict;

src/sat/tactic/CMakeLists.txt

@@ -6,6 +6,7 @@ z3_add_component(sat_tactic
   COMPONENT_DEPENDENCIES
     sat
     tactic
+    solver
   TACTIC_HEADERS
     sat_tactic.h
 )