X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/040d8fa855d2b6ac9884f68108a09b935570be21..d236809e6149a03ef3e53599458f51c98f79f94d:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index 17b7f43941..53d3418baa 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -28,10 +28,12 @@ template class xbt::Extendable; namespace s4u { +#ifndef DOXYGEN xbt::signal Host::on_creation; xbt::signal Host::on_destruction; xbt::signal Host::on_state_change; xbt::signal Host::on_speed_change; +#endif Host* Host::set_cpu(kernel::resource::CpuImpl* cpu) { @@ -77,7 +79,7 @@ Host* Host::by_name_or_null(const std::string& name) Host* Host::current() { - kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); + const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); xbt_assert(self != nullptr, "Cannot call Host::current() from the maestro context"); return self->get_host(); } @@ -185,18 +187,6 @@ NetZone* Host::get_englobing_zone() const return pimpl_netpoint_->get_englobing_zone()->get_iface(); } -#ifndef DOXYGEN -void Host::sendto(Host* dest, double byte_amount) // XBT_ATTRIB_DEPRECATED_v331 -{ - Comm::sendto_async(this, dest, byte_amount)->wait(); -} - -CommPtr Host::sendto_async(Host* dest, double byte_amount) // XBT_ATTRIB_DEPRECATED_v331 -{ - return Comm::sendto_async(this, dest, byte_amount); -} -#endif - /** Get the properties assigned to a host */ const std::unordered_map* Host::get_properties() const { @@ -460,7 +450,7 @@ sg_host_t sg_host_by_name(const char* name) // ========== User data Layer ========== void* sg_host_get_data(const_sg_host_t host) { - return host->get_data(); + return host->get_data(); } void sg_host_set_data(sg_host_t host, void* userdata) {