Merge branch 'CompilerWarnings' of https://github.com/MartinNowack/klee into MartinNowack-CompilerWarnings

1 files changed, 5 insertions, 1 deletions

diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index 79f29d2d..0d899ae9 100644
--- a/tools/klee/main.cpp
+++ b/tools/klee/main.cpp
@@ -303,7 +303,11 @@ KleeHandler::KleeHandler(int argc, char **argv)
   }
   
   sys::Path p(theDir);
+#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1)
   if (!p.isAbsolute()) {
+#else
+  if (!sys::path::is_absolute(p.c_str())) {
+#endif
     sys::Path cwd = sys::Path::GetCurrentDirectory();
     cwd.appendComponent(theDir);
     p = cwd;
@@ -600,7 +604,7 @@ static void parseArguments(int argc, char **argv) {
     argArray[i] = arguments[i-1].c_str();
   }
 
-  cl::ParseCommandLineOptions(numArgs, (char**) argArray, " klee\n");
+  cl::ParseCommandLineOptions(numArgs, (const char**) argArray, " klee\n");
   delete[] argArray;
 }