X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e08a76b1a43e12302ebd25abbe8830fcefca72b..22a45a8d97ef0f1211ee05f9c16d7d90b37cf33b:/src/kernel/activity/CommImpl.hpp diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp index 842d407d17..849f605785 100644 --- a/src/kernel/activity/CommImpl.hpp +++ b/src/kernel/activity/CommImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -15,8 +15,7 @@ namespace simgrid { namespace kernel { namespace activity { -XBT_PUBLIC_CLASS CommImpl : public ActivityImpl -{ +class XBT_PUBLIC CommImpl : public ActivityImpl { ~CommImpl() override; public: @@ -46,9 +45,9 @@ expectations of the other side, too. See */ void (*copy_data_fun)(smx_activity_t, void*, size_t) = nullptr; /* Surf action data */ - surf_action_t surfAction_ = nullptr; /* The Surf communication action encapsulated */ - surf_action_t src_timeout = nullptr; /* Surf's actions to instrument the timeouts */ - surf_action_t dst_timeout = nullptr; /* Surf's actions to instrument the timeouts */ + simgrid::kernel::resource::Action* surfAction_ = nullptr; /* The Surf communication action encapsulated */ + simgrid::kernel::resource::Action* src_timeout = nullptr; /* Surf's actions to instrument the timeouts */ + simgrid::kernel::resource::Action* dst_timeout = nullptr; /* Surf's actions to instrument the timeouts */ smx_actor_t src_proc = nullptr; smx_actor_t dst_proc = nullptr; double rate = 0.0;