From 664347487ca94017fb1bc3bf86f7438425c8fd28 Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 11 Dec 2019 15:32:45 +0100
Subject: [PATCH] cleanups

---
 include/simgrid/s4u/Activity.hpp | 20 --------------------
 src/s4u/s4u_Activity.cpp         |  1 +
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index 34d41e0fac..ccdcea1678 100644
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -7,7 +7,6 @@
 #define SIMGRID_S4U_ACTIVITY_HPP
 
 #include "xbt/asserts.h"
-#include "xbt/log.h"
 #include <atomic>
 #include <set>
 #include <simgrid/forward.h>
@@ -88,23 +87,6 @@ private:
   double remains_                          = 0;
 };
 
-// template <class AnyActivity> class DependencyGuard {
-// public:
-//  static bool activity_start_vetoer(AnyActivity* a) { return not a->has_dependencies(); }
-//  static void on_activity_done(AnyActivity* a);
-////  {
-////    while (a->has_successors()) {
-////      AnyActivity* b = a->get_successor();
-////      b->remove_dependency_on(a);
-////      if (not b->has_dependencies()) {
-////        XBT_INFO("Activity is done and a successor can start");
-////        b->vetoable_start();
-////      }
-////      a->remove_successor();
-////    }
-////  }
-//};
-
 template <class AnyActivity> class Activity_T : public Activity {
 private:
   std::string name_             = "";
@@ -144,7 +126,6 @@ public:
       AnyActivity* b = get_successor();
       b->remove_dependency_on(static_cast<AnyActivity*>(this));
       if (not b->has_dependencies()) {
-        // XBT_INFO("Activity is done and a successor can start");
         b->vetoable_start();
       }
       remove_successor();
@@ -156,7 +137,6 @@ public:
     set_state(State::STARTING);
     if (has_dependencies())
       return static_cast<AnyActivity*>(this);
-    //    XBT_INFO("No veto, Activity can start");
     set_state(State::STARTED);
     static_cast<AnyActivity*>(this)->start();
     return static_cast<AnyActivity*>(this);
diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp
index 14f2880d74..e52b3f2a13 100644
--- a/src/s4u/s4u_Activity.cpp
+++ b/src/s4u/s4u_Activity.cpp
@@ -7,6 +7,7 @@
 
 #include "simgrid/s4u/Activity.hpp"
 #include "simgrid/s4u/Engine.hpp"
+
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity, s4u, "S4U activities");
 
-- 
2.20.1