From a39ad6584c1d61e22e72b53c3838f4f675ed2e19 Mon Sep 17 00:00:00 2001 From: Tim King Date: Thu, 24 Dec 2015 05:38:43 -0500 Subject: 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. --- src/util/divisible.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/util/divisible.cpp') diff --git a/src/util/divisible.cpp b/src/util/divisible.cpp index 4a8b7a2e7..85824a77f 100644 --- a/src/util/divisible.cpp +++ b/src/util/divisible.cpp @@ -17,6 +17,7 @@ #include "util/divisible.h" +#include "base/cvc4_assert.h" #include "base/exception.h" using namespace std; @@ -24,7 +25,7 @@ using namespace std; namespace CVC4 { Divisible::Divisible(const Integer& n) : k(n) { - CheckArgument(n > 0, n, "Divisible predicate must be constructed over positive N"); + PrettyCheckArgument(n > 0, n, "Divisible predicate must be constructed over positive N"); } }/* CVC4 namespace */ -- cgit v1.2.3