diff options
| author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2017-07-27 10:05:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 10:05:30 +0100 |
| commit | b46f8186e60a18ec81e2f03783482c76ac234880 (patch) | |
| tree | ac6644d91c014feac5528a3996deb7c05a54b844 /include | |
| parent | ee2f1f37cb113324de04d840d42bbd891e9dfd19 (diff) | |
| parent | 57129f1a3131d660c1d41ebafc864daf98192274 (diff) | |
| download | klee-b46f8186e60a18ec81e2f03783482c76ac234880.tar.gz | |
Merge pull request #734 from ccadar/misc
Now that LLVM 2.9 is gone, we can use cl::bits when needed
Diffstat (limited to 'include')
| -rw-r--r-- | include/klee/CommandLine.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/klee/CommandLine.h b/include/klee/CommandLine.h index 6a72692d..64930bb2 100644 --- a/include/klee/CommandLine.h +++ b/include/klee/CommandLine.h @@ -40,11 +40,7 @@ enum QueryLoggingSolverType SOLVER_SMTLIB ///< Log queries passed to solver (optimised) in .smt2 (SMT-LIBv2) format }; -/* Using cl::list<> instead of cl::bits<> results in quite a bit of ugliness when it comes to checking - * if an option is set. Unfortunately with gcc4.7 cl::bits<> is broken with LLVM2.9 and I doubt everyone - * wants to patch their copy of LLVM just for these options. - */ -extern llvm::cl::list<QueryLoggingSolverType> queryLoggingOptions; +extern llvm::cl::bits<QueryLoggingSolverType> queryLoggingOptions; enum CoreSolverType { STP_SOLVER, @@ -70,12 +66,6 @@ extern llvm::cl::opt<klee::MetaSMTBackendType> MetaSMTBackend; #endif /* ENABLE_METASMT */ -//A bit of ugliness so we can use cl::list<> like cl::bits<>, see queryLoggingOptions -template <typename T> -static bool optionIsSet(llvm::cl::list<T> &list, T option) { - return std::find(list.begin(), list.end(), option) != list.end(); -} - } #endif /* KLEE_COMMANDLINE_H */ |