please codacy: use long form of negation in C++

[simgrid.git] / src / kernel / activity / SynchroExec.hpp

diff --git a/src/kernel/activity/SynchroExec.hpp b/src/kernel/activity/SynchroExec.hpp
index facfa53..ad3e1fa 100644 (file)
--- a/src/kernel/activity/SynchroExec.hpp
+++ b/src/kernel/activity/SynchroExec.hpp
@@ -1,19 +1,19 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _SIMIX_SYNCHRO_EXEC_HPP
-#define _SIMIX_SYNCHRO_EXEC_HPP
+#ifndef SIMIX_SYNCHRO_EXEC_HPP
+#define SIMIX_SYNCHRO_EXEC_HPP
 
 #include "surf/surf.h"
-#include "src/kernel/activity/Synchro.h"
+#include "src/kernel/activity/ActivityImpl.hpp"
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-  XBT_PUBLIC_CLASS Exec : public Synchro {
+  XBT_PUBLIC_CLASS Exec : public ActivityImpl {
     ~Exec() override;
   public:
     Exec(const char*name, sg_host_t host);
@@ -22,8 +22,9 @@ namespace activity {
     void post() override;
     double remains();
 
-    sg_host_t host = nullptr; /* The host where the execution takes place. If nullptr, then this is a parallel exec (and only surf knows the hosts) */
+    sg_host_t host_ = nullptr; /* The host where the execution takes place. If nullptr, then this is a parallel exec (and only surf knows the hosts) */
     surf_action_t surf_exec = nullptr; /* The Surf execution action encapsulated */
+    surf::Action* timeoutDetector = nullptr;
   };
 
 }}} // namespace simgrid::kernel::activity