diff options
| author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2013-08-30 16:30:53 +0100 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2013-08-30 16:30:53 +0100 |
| commit | 8cc2105aeb16e081a2ddd1128b6455cbdcb2ed3d (patch) | |
| tree | 65c5a8ebdfc98f91e3853e52cf845000a61967d7 | |
| parent | 73449518ce3420b3abf876a7cf8d8867741957e4 (diff) | |
| parent | aa141a92a90001aa1606db474a08a2c4caed1800 (diff) | |
| download | klee-8cc2105aeb16e081a2ddd1128b6455cbdcb2ed3d.tar.gz | |
Merge branch 'CompilerWarnings' of https://github.com/MartinNowack/klee into MartinNowack-CompilerWarnings
| -rw-r--r-- | lib/Core/StatsTracker.cpp | 11 | ||||
| -rw-r--r-- | tools/klee/main.cpp | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp index ae9910e5..c0028a05 100644 --- a/lib/Core/StatsTracker.cpp +++ b/lib/Core/StatsTracker.cpp @@ -38,12 +38,17 @@ #include "llvm/Support/CFG.h" #if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) #include "llvm/System/Process.h" -#include "llvm/System/Path.h" #else #include "llvm/Support/Process.h" +#endif +#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) +#include "llvm/System/Path.h" +#else #include "llvm/Support/Path.h" +#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 1) #include "llvm/Support/FileSystem.h" #endif +#endif #include <iostream> #include <fstream> @@ -175,14 +180,14 @@ StatsTracker::StatsTracker(Executor &_executor, std::string _objectFilename, KModule *km = executor.kmodule; sys::Path module(objectFilename); -#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) +#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1) if (!sys::Path(objectFilename).isAbsolute()) { #else if (!sys::path::is_absolute(objectFilename)) { #endif sys::Path current = sys::Path::GetCurrentDirectory(); current.appendComponent(objectFilename); -#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) +#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1) if (current.exists()) #else if (sys::fs::exists(current.c_str())) diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index 42c0c4ba..92e4df67 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -303,7 +303,7 @@ KleeHandler::KleeHandler(int argc, char **argv) } sys::Path p(theDir); -#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) +#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1) if (!p.isAbsolute()) { #else if (!sys::path::is_absolute(p.c_str())) { |