diff options
author | Tim King <taking@google.com> | 2015-12-24 05:38:43 -0500 |
---|---|---|
committer | Tim King <taking@google.com> | 2015-12-24 05:38:43 -0500 |
commit | a39ad6584c1d61e22e72b53c3838f4f675ed2e19 (patch) | |
tree | ed40cb371c41ac285ca2bf41a82254a36134e132 /src/proof | |
parent | 87b0fe9ce10d1e5e9ed5a3e7db77f46bf3f68922 (diff) |
Miscellaneous fixes
- Splitting the two instances of CheckArgument. The template version is now always defined in base/exception.h and is available in a cvc4_public header. This version has lost its variadic version (due to swig not supporting va_list's). The CPP macro version has been renamed PrettyCheckArgument. (Taking suggestions for a better name.) This is now only defined in base/cvc4_assert.h. Only use this in cvc4_private headers and in .cpp files that can use cvc4_private headers. To use a variadic version of CheckArguments, outside of this scope, you need to duplicate this macro locally. See cvc3_compat.cpp for an example.
- Making fitsSignedInt() and fitsUnsignedInt() work more robustly for CLN on 32 bit systems.
- Refactoring ArrayStoreAll to avoid potential problems with circular header inclusions.
- Changing some headers to use iosfwd when possible.
Diffstat (limited to 'src/proof')
-rw-r--r-- | src/proof/cnf_proof.h | 13 | ||||
-rw-r--r-- | src/proof/proof_manager.h | 7 | ||||
-rw-r--r-- | src/proof/sat_proof.h | 8 | ||||
-rw-r--r-- | src/proof/theory_proof.h | 9 | ||||
-rw-r--r-- | src/proof/unsat_core.h | 3 |
5 files changed, 23 insertions, 17 deletions
diff --git a/src/proof/cnf_proof.h b/src/proof/cnf_proof.h index c1d245716..d3e59ef93 100644 --- a/src/proof/cnf_proof.h +++ b/src/proof/cnf_proof.h @@ -16,16 +16,17 @@ ** **/ +#include "cvc4_private.h" + #ifndef __CVC4__CNF_PROOF_H #define __CVC4__CNF_PROOF_H -#include "cvc4_private.h" -#include "util/proof.h" -#include "proof/sat_proof.h" - -#include <ext/hash_set> #include <ext/hash_map> -#include <iostream> +#include <ext/hash_set> +#include <iosfwd> + +#include "proof/sat_proof.h" +#include "util/proof.h" namespace CVC4 { namespace prop { diff --git a/src/proof/proof_manager.h b/src/proof/proof_manager.h index 4bab86745..6864eca3d 100644 --- a/src/proof/proof_manager.h +++ b/src/proof/proof_manager.h @@ -19,13 +19,14 @@ #ifndef __CVC4__PROOF_MANAGER_H #define __CVC4__PROOF_MANAGER_H -#include <iostream> +#include <iosfwd> #include <map> -#include "proof/proof.h" -#include "util/proof.h" + #include "expr/node.h" +#include "proof/proof.h" #include "theory/logic_info.h" #include "theory/substitutions.h" +#include "util/proof.h" namespace CVC4 { diff --git a/src/proof/sat_proof.h b/src/proof/sat_proof.h index a9793e784..52319431c 100644 --- a/src/proof/sat_proof.h +++ b/src/proof/sat_proof.h @@ -19,13 +19,15 @@ #ifndef __CVC4__SAT__PROOF_H #define __CVC4__SAT__PROOF_H -#include <iostream> #include <stdint.h> -#include <vector> -#include <set> + #include <ext/hash_map> #include <ext/hash_set> +#include <iosfwd> +#include <set> #include <sstream> +#include <vector> + #include "expr/expr.h" #include "proof/proof_manager.h" diff --git a/src/proof/theory_proof.h b/src/proof/theory_proof.h index d69ec5db9..375ec8205 100644 --- a/src/proof/theory_proof.h +++ b/src/proof/theory_proof.h @@ -16,15 +16,16 @@ ** **/ +#include "cvc4_private.h" #ifndef __CVC4__THEORY_PROOF_H #define __CVC4__THEORY_PROOF_H -#include "cvc4_private.h" -#include "util/proof.h" -#include "expr/expr.h" #include <ext/hash_set> -#include <iostream> +#include <iosfwd> + +#include "expr/expr.h" +#include "util/proof.h" namespace CVC4 { diff --git a/src/proof/unsat_core.h b/src/proof/unsat_core.h index 644f56509..8e92fe3d1 100644 --- a/src/proof/unsat_core.h +++ b/src/proof/unsat_core.h @@ -20,8 +20,9 @@ #ifndef __CVC4__UNSAT_CORE_H #define __CVC4__UNSAT_CORE_H -#include <iostream> +#include <iosfwd> #include <vector> + #include "expr/expr.h" namespace CVC4 { |