checkpoint

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>

src/api/smtlib_solver.cpp

@@ -26,7 +26,6 @@ Revision History:
 #include"spc_prover.h"
 #include"model.h"
 #include"model_v2_pp.h"
-// #include"expr2dot.h"
 #include"solver.h"
 #include"smt_strategic_solver.h"
 #include"cmd_context.h"

src/api/smtparser.cpp

@@ -45,10 +45,7 @@ Revision History:
 #include"well_sorted.h"
 #include "str_hashtable.h"
 #include "front_end_params.h"
-// #include "z3_private.h"
 #include "stopwatch.h"
-// #include "dl_rule.h"
-// private method defined in z3.cpp:
 front_end_params& Z3_API Z3_get_parameters(__in Z3_context c);
 
 class id_param_info {

src/muz_qe/pdr_farkas_learner.cpp

@@ -29,7 +29,6 @@ Revision History:
 #include "pdr_util.h"
 #include "pdr_farkas_learner.h"
 #include "th_rewriter.h"
-// #include "smtparser.h"
 #include "pdr_interpolant_provider.h"
 #include "ast_ll_pp.h"
 #include "arith_bounds_tactic.h"

src/muz_qe/pdr_farkas_learner.h

@@ -24,7 +24,6 @@ Revision History:
 #include "ast_translation.h"
 #include "bv_decl_plugin.h"
 #include "smt_solver.h"
-#include "pdr_manager.h"
 #include "bool_rewriter.h"
 #include "pdr_util.h"
 #include "front_end_params.h"

src/sat/sat_clause.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"memory.h"
+#include<memory.h>
 #include"sat_clause.h"
 #include"z3_exception.h"
 

src/smt/asserted_formulas.cpp

@@ -42,7 +42,6 @@ Revision History:
 #include"warning.h"
 #include"eager_bit_blaster.h"
 #include"bit2int.h"
-// #include"qe.h"
 #include"distribute_forall.h"
 #include"demodulator.h"
 #include"quasi_macros.h"

src/smt/asserted_formulas.h

@@ -29,7 +29,6 @@ Revision History:
 #include"solver_plugin.h"
 #include"maximise_ac_sharing.h"
 #include"bit2int.h"
-// #include"qe.h"
 #include"statistics.h"
 #include"user_rewriter.h"
 #include"pattern_inference.h"

src/test/api_bug.cpp

@@ -1,5 +1,5 @@
-#include "z3.h"
-#include "stdio.h"
+#include<stdio.h>
+#include"z3.h"
 
 void tst_api_bug() {
     unsigned vmajor, vminor, vbuild, vrevision;

src/test/par_dll.cpp

@@ -1,5 +1,5 @@
 #include "z3.h"
-#include "windows.h"
+#include <windows.h>
 
 class thread_check {
 

src/test/parallel.cpp

@@ -10,7 +10,7 @@
 #include "vector.h"
 #include "buffer.h"
 #undef ARRAYSIZE
-#include "windows.h"
+#include <windows.h>
 
 class thread_check {
 

src/test/timeout.cpp

@@ -4,7 +4,7 @@
 
 #ifdef _WINDOWS
 
-#include "windows.h"
+#include <windows.h>
 
 void tst_timeout() {
 }

src/util/hashtable.h

@@ -21,7 +21,7 @@ Revision History:
 #include"debug.h"
 #include<ostream>
 #include"util.h"
-#include"limits.h"
+#include<limits.h>
 #include"memory_manager.h"
 #include"hash.h"
 

src/util/instruction_count.cpp

@@ -1,5 +1,5 @@
 #ifdef _WINDOWS
-#include "windows.h"
+#include <windows.h>
 #endif
 #include "instruction_count.h"
 

src/util/mpz.cpp

@@ -23,16 +23,7 @@ Revision History:
 #include"hash.h"
 #include"bit_util.h"
 
-#if defined(_MP_MSBIGNUM)
-#define COMPILER COMPILER_VC
-#ifndef NDEBUG
-#define NDEBUG
-#endif
-#ifdef ARRAYSIZE
-#undef ARRAYSIZE
-#endif
-#include "..\msbig_rational\msbignum.h"
-#elif defined(_MP_INTERNAL)
+#if defined(_MP_INTERNAL)
 #include"mpn.h"
 #elif defined(_MP_GMP)
 #include<gmp.h>

src/util/nat_set.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef _NAT_SET_H_
 #define _NAT_SET_H_
 
+#include<limits.h>
 #include"vector.h"
-#include"limits.h"
 
 class nat_set {
     unsigned          m_curr_timestamp;

src/util/util.cpp

@@ -160,7 +160,7 @@ void escaped::display(std::ostream & out) const {
 #ifdef ARRAYSIZE
 #undef ARRAYSIZE
 #endif
-#include "windows.h"
+#include <windows.h>
 #endif
 
 void z3_bound_num_procs() {

src/util/z3_omp.h

@@ -20,7 +20,7 @@ Notes:
 #define _Z3_OMP_H
 
 #ifndef _NO_OMP_
-#include"omp.h"
+#include<omp.h>
 #else
 #define omp_in_parallel() false
 #define omp_set_num_threads(SZ) ((void)0)