fix #1762, #1764, #1768

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

src/util/approx_nat.h

@@ -21,7 +21,7 @@ Notes:
 #define APPROX_NAT_H_
 
 #include<iostream>
-#include<limits.h>
+#include<limits>
 
 class approx_nat {
     unsigned m_value;

src/util/bit_vector.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include<limits.h>
+#include<climits>
 #include "util/bit_vector.h"
 #include "util/trace.h"
 

src/util/fixed_bit_vector.cpp

@@ -19,7 +19,7 @@ Revision History:
 
 --*/
 
-#include<limits.h>
+#include<climits>
 #include "util/fixed_bit_vector.h"
 #include "util/trace.h"
 #include "util/hash.h"

src/util/hashtable.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef HASHTABLE_H_
 #define HASHTABLE_H_
 #include "util/debug.h"
-#include<ostream>
+#include <ostream>
 #include "util/util.h"
-#include<limits.h>
+#include <climits>
 #include "util/memory_manager.h"
 #include "util/hash.h"
 #include "util/vector.h"

src/util/lp/lar_solver.cpp

@@ -538,12 +538,16 @@ lp_status lar_solver::maximize_term(unsigned ext_j,
         if (column_value_is_integer(j))
             continue;
         if (m_int_solver->is_base(j)) {
-            if (!remove_from_basis(j)) // consider a special version of remove_from_basis that would not remove inf_int columns
+            if (!remove_from_basis(j)) { // consider a special version of remove_from_basis that would not remove inf_int columns
+                m_mpq_lar_core_solver.m_r_x = backup;
                 return lp_status::FEASIBLE; // it should not happen
+            }
         }
         m_int_solver->patch_nbasic_column(j, false);
-        if (!column_value_is_integer(j))
+        if (!column_value_is_integer(j)) {
+            m_mpq_lar_core_solver.m_r_x = backup;
             return lp_status::FEASIBLE;
+        }
         change = true;
     }
     if (change) {

src/util/memory_manager.cpp

@@ -6,7 +6,7 @@ Copyright (c) 2015 Microsoft Corporation
 
 #include<iostream>
 #include<stdlib.h>
-#include<limits.h>
+#include<climits>
 #include "util/trace.h"
 #include "util/memory_manager.h"
 #include "util/error_codes.h"

src/util/mpz.h

@@ -19,7 +19,6 @@ Revision History:
 #ifndef MPZ_H_
 #define MPZ_H_
 
-#include<limits.h>
 #include<string>
 #include "util/util.h"
 #include "util/small_object_allocator.h"

src/util/nat_set.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef NAT_SET_H_
 #define NAT_SET_H_
 
-#include<limits.h>
+#include <climits>
 #include "util/vector.h"
 
 class nat_set {

src/util/scoped_timer.cpp

@@ -50,7 +50,7 @@ Revision History:
 #undef max
 #endif
 #include "util/util.h"
-#include<limits.h>
+#include<climits>
 #include "util/z3_omp.h"
 
 struct scoped_timer::imp {

src/util/symbol.h

@@ -19,7 +19,7 @@ Revision History:
 #ifndef SYMBOL_H_
 #define SYMBOL_H_
 #include<ostream>
-#include<limits.h>
+#include<climits>
 
 #include "util/util.h"
 #include "util/tptr.h"