Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/src/mc/Checker.cpp b/src/mc/Checker.cpp
index 159e3d5..cfa6563 100644 (file)
--- a/src/mc/Checker.cpp
+++ b/src/mc/Checker.cpp
@@ -13,14 +13,5 @@ Checker::~Checker()
 {
 }
 
-FunctionalChecker::~FunctionalChecker()
-{
-}
-
-int FunctionalChecker::run()
-{
-  return function_(*session_);
-}
-
 }
 }

diff --git a/src/mc/Checker.hpp b/src/mc/Checker.hpp
index 478665a..cf3e37a 100644 (file)
--- a/src/mc/Checker.hpp
+++ b/src/mc/Checker.hpp
@@ -41,17 +41,6 @@ protected:
   Session& getSession() { return *session_; }
 };
 
-/** Adapt a std::function to a checker */
-class FunctionalChecker : public Checker {
-  Session* session_;
-  std::function<int(Session& session)> function_;
-public:
-  FunctionalChecker(Session& session, std::function<int(Session& session)> f)
-    : Checker(session), function_(std::move(f)) {}
-  ~FunctionalChecker();
-  int run() override;
-};
-
 }
 }
 

diff --git a/src/mc/mc_forward.hpp b/src/mc/mc_forward.hpp
index 5b0cc70..692d867 100644 (file)
--- a/src/mc/mc_forward.hpp
+++ b/src/mc/mc_forward.hpp
@@ -30,7 +30,6 @@ class SimixProcessInformation;
 
 class Session;
 class Checker;
-class FunctionalChecker;
 
 }
 }

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index 949ed65..719087f 100644 (file)
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -45,10 +45,6 @@ char** argvdup(int argc, char** argv)
 static
 std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
 {
-  using simgrid::mc::Session;
-  using simgrid::mc::FunctionalChecker;
-
-  std::function<int(Session& session)> code;
   if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
     return std::unique_ptr<simgrid::mc::Checker>(
       new simgrid::mc::CommunicationDeterminismChecker(session));
@@ -58,9 +54,6 @@ std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& sessio
   else
     return std::unique_ptr<simgrid::mc::Checker>(
       new simgrid::mc::LivenessChecker(session));
-
-  return std::unique_ptr<simgrid::mc::Checker>(
-    new FunctionalChecker(session, std::move(code)));
 }
 
 int main(int argc, char** argv)