diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-03-12 23:52:14 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-03-12 23:52:14 +0000 |
commit | c8e9b1d6422b56476a2efb3fbaf19bce66de4c2b (patch) | |
tree | aa2b6400b7a5663599eff687310c509156ca788d /src/main | |
parent | 856567b63c56b238db8a5bb84ad0da7990c1f1eb (diff) |
* src/context/cdmap.h: rename orderedIterator to iterator, do away
with old iterator (closes bug #47).
* src/context/cdset.h: implemented.
* src/expr/node_builder.h: fixed all the strict-aliasing warnings.
* Remove Node::hash() and Expr::hash() (they had been aliases for
getId()). There's now a NodeValue::internalHash(), for internal
expr package purposes only, that doesn't depend on the ID. That's
the only hashing of Nodes or Exprs.
* Automake-quiet generation of kind.h, theoryof_table.h, and CVC and
SMT parsers.
* various minor code cleanups.
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/getopt.cpp | 2 | ||||
-rw-r--r-- | src/main/main.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/getopt.cpp b/src/main/getopt.cpp index b319b7293..df94ef9ab 100644 --- a/src/main/getopt.cpp +++ b/src/main/getopt.cpp @@ -107,7 +107,7 @@ const char *progPath; const char *progName; /** Parse argc/argv and put the result into a CVC4::Options struct. */ -int parseOptions(int argc, char** argv, CVC4::Options* opts) +int parseOptions(int argc, char* argv[], CVC4::Options* opts) throw(OptionException) { progPath = progName = argv[0]; int c; diff --git a/src/main/main.cpp b/src/main/main.cpp index 1da56b9f9..f5e53f34a 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -39,7 +39,7 @@ using namespace CVC4::main; static Result lastResult; static struct Options options; -int runCvc4(int argc, char *argv[]); +int runCvc4(int argc, char* argv[]); void doCommand(SmtEngine&, Command*); /** @@ -49,7 +49,7 @@ void doCommand(SmtEngine&, Command*); * problems. That's why main() wraps runCvc4() in the first place. * Put everything in runCvc4(). */ -int main(int argc, char *argv[]) { +int main(int argc, char* argv[]) { try { return runCvc4(argc, argv); } catch(OptionException& e) { @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) { } } -int runCvc4(int argc, char *argv[]) { +int runCvc4(int argc, char* argv[]) { // Initialize the signal handlers cvc4_init(); |