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/main/command_executor.h | 2 +- src/main/command_executor_portfolio.h | 6 +++--- src/main/interactive_shell.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/command_executor.h b/src/main/command_executor.h index 49d18a153..8ef1a6a5f 100644 --- a/src/main/command_executor.h +++ b/src/main/command_executor.h @@ -15,7 +15,7 @@ #ifndef __CVC4__MAIN__COMMAND_EXECUTOR_H #define __CVC4__MAIN__COMMAND_EXECUTOR_H -#include +#include #include #include "expr/expr_manager.h" diff --git a/src/main/command_executor_portfolio.h b/src/main/command_executor_portfolio.h index b3532cea4..ee2b270fb 100644 --- a/src/main/command_executor_portfolio.h +++ b/src/main/command_executor_portfolio.h @@ -21,10 +21,10 @@ #include "main/command_executor.h" #include "main/portfolio_util.h" -#include -#include -#include +#include #include +#include +#include namespace CVC4 { diff --git a/src/main/interactive_shell.h b/src/main/interactive_shell.h index 1b1031776..844fddf45 100644 --- a/src/main/interactive_shell.h +++ b/src/main/interactive_shell.h @@ -15,7 +15,7 @@ #ifndef __CVC4__INTERACTIVE_SHELL_H #define __CVC4__INTERACTIVE_SHELL_H -#include +#include #include #include "options/language.h" -- cgit v1.2.3