diff options
| author | Julian Büning <julian.buening@rwth-aachen.de> | 2019-03-20 22:01:00 +0100 |
|---|---|---|
| committer | MartinNowack <martin.nowack@gmail.com> | 2019-03-21 12:46:01 +0000 |
| commit | 9767a37f9e8a743fa81629510346cb0a5a3a7900 (patch) | |
| tree | bc49e16925582e41ee51cacc35c4f7bcafd8860f /lib/Support | |
| parent | eee440835b857a7cb68b72f4af4d22eaf19e1d76 (diff) | |
| download | klee-9767a37f9e8a743fa81629510346cb0a5a3a7900.tar.gz | |
drop support for LLVM <= 3.7
Diffstat (limited to 'lib/Support')
| -rw-r--r-- | lib/Support/CompressionStream.cpp | 11 | ||||
| -rw-r--r-- | lib/Support/FileHandling.cpp | 8 |
2 files changed, 3 insertions, 16 deletions
diff --git a/lib/Support/CompressionStream.cpp b/lib/Support/CompressionStream.cpp index ff2d290f..4f818897 100644 --- a/lib/Support/CompressionStream.cpp +++ b/lib/Support/CompressionStream.cpp @@ -10,15 +10,13 @@ #include "klee/Config/Version.h" #ifdef HAVE_ZLIB_H #include "klee/Internal/Support/CompressionStream.h" -#if (LLVM_VERSION_CODE == LLVM_VERSION(3, 4)) -#include "llvm/Support/system_error.h" -#else + #include "llvm/Support/FileSystem.h" + #include <fcntl.h> #include <errno.h> #include <sys/types.h> #include <sys/stat.h> -#endif #include <unistd.h> namespace klee { @@ -31,12 +29,9 @@ compressed_fd_ostream::compressed_fd_ostream(const std::string &Filename, #if LLVM_VERSION_CODE >= LLVM_VERSION(7, 0) std::error_code EC = llvm::sys::fs::openFileForWrite(Filename, FD); -#elif LLVM_VERSION_CODE >= LLVM_VERSION(3, 5) +#else std::error_code EC = llvm::sys::fs::openFileForWrite(Filename, FD, llvm::sys::fs::F_None); -#else - llvm::error_code EC = - llvm::sys::fs::openFileForWrite(Filename, FD, llvm::sys::fs::F_Binary); #endif if (EC) { ErrorInfo = EC.message(); diff --git a/lib/Support/FileHandling.cpp b/lib/Support/FileHandling.cpp index 068ce44b..af532a0e 100644 --- a/lib/Support/FileHandling.cpp +++ b/lib/Support/FileHandling.cpp @@ -12,9 +12,7 @@ #include "klee/Config/config.h" #include "klee/Internal/Support/ErrorHandling.h" -#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 5) #include "llvm/Support/FileSystem.h" -#endif #ifdef HAVE_ZLIB_H #include "klee/Internal/Support/CompressionStream.h" @@ -26,16 +24,10 @@ std::unique_ptr<llvm::raw_fd_ostream> klee_open_output_file(const std::string &path, std::string &error) { error = ""; std::unique_ptr<llvm::raw_fd_ostream> f; -#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 6) std::error_code ec; f = std::unique_ptr<llvm::raw_fd_ostream>(new llvm::raw_fd_ostream(path.c_str(), ec, llvm::sys::fs::F_None)); // FIXME C++14 if (ec) error = ec.message(); -#elif LLVM_VERSION_CODE >= LLVM_VERSION(3, 5) - f = std::unique_ptr<llvm::raw_fd_ostream>(new llvm::raw_fd_ostream(path.c_str(), error, llvm::sys::fs::F_None)); // FIXME C++14 -#else - f = std::unique_ptr<llvm::raw_fd_ostream>(new llvm::raw_fd_ostream(path.c_str(), error, llvm::sys::fs::F_Binary)); // FIXME C++14 -#endif if (!error.empty()) { f.reset(nullptr); } |