From: Arnaud Giersch Date: Tue, 2 Jul 2019 14:15:57 +0000 (+0200) Subject: Cosmetics: namespace simgrid is implicit. X-Git-Tag: v3.23.2~32 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/aa9aaddbb9eba6ea28865d0e78f74cc523658b42 Cosmetics: namespace simgrid is implicit. --- diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index bbff07e519..f339212d4f 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -45,7 +45,7 @@ Task* Task::create(const std::string& name, double flops_amount, double bytes_am Task* Task::create_parallel(const std::string& name, int host_nb, const msg_host_t* host_list, double* flops_amount, double* bytes_amount, void* data) { - std::vector hosts(host_list, host_list + host_nb); + std::vector hosts(host_list, host_list + host_nb); std::vector flops; std::vector bytes; if (flops_amount != nullptr) @@ -100,9 +100,9 @@ msg_error_t Task::execute() s4u::CommPtr Task::send_async(const std::string& alias, void_f_pvoid_t cleanup, bool detached) { if (TRACE_actor_is_enabled()) { - container_t process_container = simgrid::instr::Container::by_name(instr_pid(*MSG_process_self())); + container_t process_container = instr::Container::by_name(instr_pid(*MSG_process_self())); std::string key = std::string("p") + std::to_string(get_id()); - simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key); + instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key); } /* Prepare the task to send */ @@ -133,11 +133,11 @@ msg_error_t Task::send(const std::string& alias, double timeout) s4u::CommPtr s4u_comm = send_async(alias, nullptr, false); comm = s4u_comm; comm->wait_for(timeout); - } catch (const simgrid::TimeoutException&) { + } catch (const TimeoutException&) { ret = MSG_TIMEOUT; - } catch (const simgrid::CancelException&) { + } catch (const CancelException&) { ret = MSG_HOST_FAILURE; - } catch (const simgrid::NetworkFailureException&) { + } catch (const NetworkFailureException&) { ret = MSG_TRANSFER_FAILURE; /* If the send failed, it is not used anymore */ set_not_used();