rename to core2 to avoid overloaded virtual

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

src/solver/combined_solver.cpp

@@ -172,7 +172,7 @@ public:
             m_solver2->assert_expr(t);
     }
 
-    virtual void assert_expr_core(expr * t, expr * a) {
+    virtual void assert_expr_core2(expr * t, expr * a) {
         if (m_check_sat_executed)
             switch_inc_mode();
         m_solver1->assert_expr(t, a);

src/solver/solver.cpp

@@ -199,7 +199,7 @@ void solver::assert_expr(expr* f, expr* t) {
             // (*mc)(a);        
         }
     }
-    assert_expr_core(fml, a);    
+    assert_expr_core2(fml, a);    
 }
 
 void solver::collect_param_descrs(param_descrs & r) {

src/solver/solver.h

@@ -102,7 +102,7 @@ public:
 
     void assert_expr(expr * t, expr* a);
 
-    virtual void assert_expr_core(expr * t, expr * a) = 0;
+    virtual void assert_expr_core2(expr * t, expr * a) = 0;
 
     /**
        \brief Create a backtracking point.

src/solver/solver_na2as.cpp

@@ -30,9 +30,9 @@ solver_na2as::solver_na2as(ast_manager & m):
 
 solver_na2as::~solver_na2as() {}
 
-void solver_na2as::assert_expr_core(expr * t, expr * a) {
+void solver_na2as::assert_expr_core2(expr * t, expr * a) {
     if (a == 0) {
-        solver::assert_expr_core(t);
+        assert_expr_core(t);
     }
     else {
         SASSERT(is_uninterp_const(a));
@@ -41,7 +41,7 @@ void solver_na2as::assert_expr_core(expr * t, expr * a) {
         m_assumptions.push_back(a);
         expr_ref new_t(m);
         new_t = m.mk_implies(a, t);
-        solver::assert_expr_core(new_t);
+        assert_expr_core(new_t);
     }
 }
 

src/solver/solver_na2as.h

@@ -34,7 +34,7 @@ public:
     solver_na2as(ast_manager & m);
     virtual ~solver_na2as();
 
-    void assert_expr_core(expr * t, expr * a) override;
+    void assert_expr_core2(expr * t, expr * a) override;
     // virtual void assert_expr_core(expr * t) = 0;
     
     // Subclasses of solver_na2as should redefine the following *_core methods instead of these ones.

src/solver/solver_pool.cpp

@@ -49,7 +49,7 @@ public:
         m_in_delayed_scope(false),
         m_dump_counter(0) {
         if (is_virtual()) {
-            solver_na2as::assert_expr_core(m.mk_true(), pred);
+            solver_na2as::assert_expr_core2(m.mk_true(), pred);
         }
     }