X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..b8df87e176f27b25534f27d7e240defa32ca35bc:/src/kernel/activity/SynchroRaw.cpp?ds=sidebyside

diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp
index 0f9e29f30d..9b9db4f3d3 100644
--- a/src/kernel/activity/SynchroRaw.cpp
+++ b/src/kernel/activity/SynchroRaw.cpp
@@ -1,35 +1,36 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
 
 #include "src/kernel/activity/SynchroRaw.hpp"
+#include "simgrid/kernel/resource/Action.hpp"
+#include "src/simix/smx_synchro_private.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "src/simix/smx_synchro_private.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_synchro);
 
-simgrid::kernel::activity::Raw::~Raw()
+simgrid::kernel::activity::RawImpl::~RawImpl()
 {
   sleep->unref();
 }
-void simgrid::kernel::activity::Raw::suspend()
+void simgrid::kernel::activity::RawImpl::suspend()
 {
   /* The suspension of raw synchros is delayed to when the process is rescheduled. */
 }
 
-void simgrid::kernel::activity::Raw::resume()
+void simgrid::kernel::activity::RawImpl::resume()
 {
   /* I cannot resume raw synchros directly. This is delayed to when the process is rescheduled at
    * the end of the synchro. */
 }
-void simgrid::kernel::activity::Raw::post()
+void simgrid::kernel::activity::RawImpl::post()
 {
   XBT_IN("(%p)",this);
-  if (sleep->getState() == simgrid::surf::Action::State::failed)
-    state = SIMIX_FAILED;
-  else if(sleep->getState() == simgrid::surf::Action::State::done)
-    state = SIMIX_SRC_TIMEOUT;
+  if (sleep->get_state() == simgrid::kernel::resource::Action::State::FAILED)
+    state_ = SIMIX_FAILED;
+  else if (sleep->get_state() == simgrid::kernel::resource::Action::State::FINISHED)
+    state_ = SIMIX_SRC_TIMEOUT;
 
   SIMIX_synchro_finish(this);
   XBT_OUT();