X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58bb531bcf303874a5e1356c750423a8490617e9..3f2f18b52285fde45c284ccb83610d4937c16c59:/src/s4u/s4u_Io.cpp

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index 86d6303c57..394580bd44 100644
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -6,7 +6,6 @@
 #include "simgrid/s4u/Io.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "src/kernel/activity/IoImpl.hpp"
-#include "src/simix/smx_io_private.hpp"
 #include "xbt/log.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
@@ -17,20 +16,19 @@ namespace s4u {
 Io::Io(sg_storage_t storage, sg_size_t size, OpType type) : Activity(), storage_(storage), size_(size), type_(type)
 {
   Activity::set_remaining(size_);
-  pimpl_ = simix::simcall(
-      [this] { return kernel::activity::IoImplPtr(new kernel::activity::IoImpl(name_, storage_->get_impl())); });
+  pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl(name_, storage_->get_impl()));
 }
 
 Io* Io::start()
 {
-  simix::simcall([this] { static_cast<kernel::activity::IoImpl*>(pimpl_.get())->start(size_, type_); });
+  simix::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->start(size_, type_); });
   state_ = State::STARTED;
   return this;
 }
 
 Io* Io::cancel()
 {
-  simgrid::simix::simcall([this] { static_cast<kernel::activity::IoImpl*>(pimpl_.get())->cancel(); });
+  simgrid::simix::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
   state_ = State::CANCELED;
   return this;
 }
@@ -45,7 +43,6 @@ Io* Io::wait()
 Io* Io::wait_for(double)
 {
   THROW_UNIMPLEMENTED;
-  return this;
 }
 
 bool Io::test()
@@ -60,7 +57,7 @@ bool Io::test()
 
   THROW_UNIMPLEMENTED;
 
-  return false;
+  // return false
 }
 
 /** @brief Returns the amount of flops that remain to be done */