From fff6485e2f3ec82b6cb31e1f5038adef09be7eed Mon Sep 17 00:00:00 2001
From: Lukas Wölfer <lukas.woelfer@rwth-aachen.de>
Date: Sat, 24 Jun 2017 18:59:27 +0200
Subject: Removed merging searchers

---
 include/klee/Internal/Module/KModule.h | 3 ---
 include/klee/klee.h                    | 2 --
 2 files changed, 5 deletions(-)

(limited to 'include')

diff --git a/include/klee/Internal/Module/KModule.h b/include/klee/Internal/Module/KModule.h
index 41253383..e8ded725 100644
--- a/include/klee/Internal/Module/KModule.h
+++ b/include/klee/Internal/Module/KModule.h
@@ -82,9 +82,6 @@ namespace klee {
   public:
     llvm::Module *module;
     llvm::DataLayout *targetData;
-    
-    // Some useful functions to know the address of
-    llvm::Function *kleeMergeFn;
 
     // Our shadow versions of LLVM structures.
     std::vector<KFunction*> functions;
diff --git a/include/klee/klee.h b/include/klee/klee.h
index d0980395..bd3100b5 100644
--- a/include/klee/klee.h
+++ b/include/klee/klee.h
@@ -152,8 +152,6 @@ extern "C" {
   /* Print range for given argument and tagged with name */
   void klee_print_range(const char * name, int arg );
 
-  /* Merge current states together if possible */
-  void klee_merge();
 #ifdef __cplusplus
 }
 #endif
-- 
cgit 1.4.1