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.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/cvc4.i b/src/cvc4.i
index ad042d398..6ee0c7572 100644
--- a/src/cvc4.i
+++ b/src/cvc4.i
@@ -40,13 +40,13 @@ namespace std {
 namespace CVC4 {}
 using namespace CVC4;
 
-#include <iostream>
-#include <vector>
+#include <cassert>
+#include <ext/hash_map>
+#include <iosfwd>
 #include <set>
 #include <string>
-#include <ext/hash_map>
 #include <typeinfo>
-#include <cassert>
+#include <vector>
 
 #include "base/exception.h"
 #include "base/modal_exception.h"