From fc50ab32349a4cc61980ba5b97bfa7c3961ce964 Mon Sep 17 00:00:00 2001 From: Cristian Cadar Date: Fri, 3 Apr 2020 19:37:11 +0100 Subject: Moved header files that were placed directly in include/klee/ into appropriate existing directories and a new directory Statistics; a few missing renames. --- lib/Solver/CexCachingSolver.cpp | 8 ++++---- lib/Solver/ConstructSolverChain.cpp | 4 ++-- lib/Solver/QueryLoggingSolver.cpp | 4 ++-- lib/Solver/STPSolver.cpp | 4 ++-- lib/Solver/SolverCmdLine.cpp | 2 +- lib/Solver/Z3Solver.cpp | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/Solver') diff --git a/lib/Solver/CexCachingSolver.cpp b/lib/Solver/CexCachingSolver.cpp index 75aba7ec..45ec5540 100644 --- a/lib/Solver/CexCachingSolver.cpp +++ b/lib/Solver/CexCachingSolver.cpp @@ -9,17 +9,17 @@ #include "klee/Solver/Solver.h" +#include "klee/ADT/MapOfSets.h" #include "klee/Expr/Assignment.h" #include "klee/Expr/Constraints.h" #include "klee/Expr/Expr.h" #include "klee/Expr/ExprUtil.h" #include "klee/Expr/ExprVisitor.h" -#include "klee/ADT/MapOfSets.h" -#include "klee/Support/ErrorHandling.h" -#include "klee/OptionCategories.h" +#include "klee/Support/OptionCategories.h" +#include "klee/Statistics/TimerStatIncrementer.h" #include "klee/Solver/SolverImpl.h" #include "klee/Solver/SolverStats.h" -#include "klee/TimerStatIncrementer.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/Support/CommandLine.h" diff --git a/lib/Solver/ConstructSolverChain.cpp b/lib/Solver/ConstructSolverChain.cpp index 1459e90a..3dab0361 100644 --- a/lib/Solver/ConstructSolverChain.cpp +++ b/lib/Solver/ConstructSolverChain.cpp @@ -11,10 +11,10 @@ * This file groups declarations that are common to both KLEE and Kleaver. */ -#include "klee/Common.h" +#include "klee/Solver/Common.h" +#include "klee/Solver/SolverCmdLine.h" #include "klee/Support/ErrorHandling.h" #include "klee/System/Time.h" -#include "klee/Solver/SolverCmdLine.h" #include "llvm/Support/raw_ostream.h" diff --git a/lib/Solver/QueryLoggingSolver.cpp b/lib/Solver/QueryLoggingSolver.cpp index d24de556..4c3d9b30 100644 --- a/lib/Solver/QueryLoggingSolver.cpp +++ b/lib/Solver/QueryLoggingSolver.cpp @@ -9,11 +9,11 @@ #include "QueryLoggingSolver.h" #include "klee/Config/config.h" +#include "klee/Support/OptionCategories.h" +#include "klee/Statistics/Statistics.h" #include "klee/Support/ErrorHandling.h" #include "klee/Support/FileHandling.h" #include "klee/System/Time.h" -#include "klee/OptionCategories.h" -#include "klee/Statistics.h" namespace { llvm::cl::opt DumpPartialQueryiesEarly( diff --git a/lib/Solver/STPSolver.cpp b/lib/Solver/STPSolver.cpp index 82a00d53..95728cde 100644 --- a/lib/Solver/STPSolver.cpp +++ b/lib/Solver/STPSolver.cpp @@ -16,9 +16,9 @@ #include "klee/Expr/Assignment.h" #include "klee/Expr/Constraints.h" #include "klee/Expr/ExprUtil.h" -#include "klee/Support/ErrorHandling.h" -#include "klee/OptionCategories.h" +#include "klee/Support/OptionCategories.h" #include "klee/Solver/SolverImpl.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Errno.h" diff --git a/lib/Solver/SolverCmdLine.cpp b/lib/Solver/SolverCmdLine.cpp index 6cc13b17..7dd8f041 100644 --- a/lib/Solver/SolverCmdLine.cpp +++ b/lib/Solver/SolverCmdLine.cpp @@ -15,7 +15,7 @@ #include "klee/Solver/SolverCmdLine.h" #include "klee/Config/Version.h" -#include "klee/OptionCategories.h" +#include "klee/Support/OptionCategories.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/StringMap.h" diff --git a/lib/Solver/Z3Solver.cpp b/lib/Solver/Z3Solver.cpp index 325a4dc9..85943e4f 100644 --- a/lib/Solver/Z3Solver.cpp +++ b/lib/Solver/Z3Solver.cpp @@ -8,9 +8,9 @@ //===----------------------------------------------------------------------===// #include "klee/Config/config.h" +#include "klee/Support/OptionCategories.h" #include "klee/Support/ErrorHandling.h" #include "klee/Support/FileHandling.h" -#include "klee/OptionCategories.h" #ifdef ENABLE_Z3 -- cgit 1.4.1