diff options
author | Dejan Jovanović <dejan.jovanovic@gmail.com> | 2012-05-13 15:51:27 +0000 |
---|---|---|
committer | Dejan Jovanović <dejan.jovanovic@gmail.com> | 2012-05-13 15:51:27 +0000 |
commit | 39c17191ad88a50bfffdbbc5ed8b493ad99b3fb5 (patch) | |
tree | 379084e939f37be0bff49a904fc853eafc8be356 /src/util | |
parent | 56bd7f581bdf1cf48db9f018a71dff22af123535 (diff) |
fixing build warnings
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/options.cpp | 12 | ||||
-rw-r--r-- | src/util/options.h | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/util/options.cpp b/src/util/options.cpp index 46997a04d..a9405fb25 100644 --- a/src/util/options.cpp +++ b/src/util/options.cpp @@ -123,9 +123,9 @@ Options::Options() : thread_id(-1), separateOutput(false), sharingFilterByLength(-1), - bitvector_eager_bitblast(false), - bitvector_share_lemmas(false), - bitvector_eager_fullcheck(false), + bitvectorEagerBitblast(false), + bitvectorEagerFullcheck(false), + bitvectorShareLemmas(false), sat_refine_conflicts(false) { } @@ -942,17 +942,17 @@ throw(OptionException) { } case BITVECTOR_EAGER_BITBLAST: { - bitvector_eager_bitblast = true; + bitvectorEagerBitblast = true; break; } case BITVECTOR_EAGER_FULLCHECK: { - bitvector_eager_fullcheck = true; + bitvectorEagerFullcheck = true; break; } case BITVECTOR_SHARE_LEMMAS: { - bitvector_share_lemmas = true; + bitvectorShareLemmas = true; break; } case SAT_REFINE_CONFLICTS: diff --git a/src/util/options.h b/src/util/options.h index fd09d4149..896f77297 100644 --- a/src/util/options.h +++ b/src/util/options.h @@ -149,6 +149,11 @@ struct CVC4_PUBLIC Options { /** Whether to do the ite-simplification pass */ bool doITESimp; + /** + * Whether the user explicitly requested ite simplification + */ + bool doITESimpSetByUser; + /** Whether we're in interactive mode or not */ bool interactive; @@ -253,11 +258,6 @@ struct CVC4_PUBLIC Options { bool ufSymmetryBreakerSetByUser; /** - * Whether the user explicitly requested ite simplification - */ - bool doITESimpSetByUser; - - /** * Whether to do the linear diophantine equation solver * in Arith as described by Griggio JSAT 2012 (on by default). */ @@ -297,13 +297,13 @@ struct CVC4_PUBLIC Options { int sharingFilterByLength; /** Bitblast eagerly to the main sat solver */ - bool bitvector_eager_bitblast; + bool bitvectorEagerBitblast; /** Fullcheck at each check */ - bool bitvector_eager_fullcheck; + bool bitvectorEagerFullcheck; /** Bitblast eagerly to the main sat solver */ - bool bitvector_share_lemmas; + bool bitvectorShareLemmas; /** Refine conflicts by doing another full check after a conflict */ bool sat_refine_conflicts; |