From 74feb4bb13c3e42871675a3dc48915309696e866 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 11 Feb 2017 00:21:57 +0100 Subject: [PATCH 1/1] easily please sonar --- include/simgrid/s4u/Link.hpp | 3 --- src/mc/Session.cpp | 6 +++--- src/simix/ActorImpl.cpp | 2 +- src/simix/MailboxImpl.hpp | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp index 93a0e9f502..05a3636368 100644 --- a/include/simgrid/s4u/Link.hpp +++ b/include/simgrid/s4u/Link.hpp @@ -20,9 +20,6 @@ ***********/ namespace simgrid { -namespace surf { -class LinkImpl; -} namespace s4u { /** @brief A Link represents the network facilities between [hosts](\ref simgrid::s4u::Host) */ class Link { diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp index 8eca37c9aa..f08f806a6c 100644 --- a/src/mc/Session.cpp +++ b/src/mc/Session.cpp @@ -143,7 +143,7 @@ Session* Session::fork(std::function code) if (res == -1) throw simgrid::xbt::errno_error("Could not create socketpair"); - pid_t pid = do_fork([&] { + pid_t pid = do_fork([sockets, &code] { ::close(sockets[1]); setup_child_environment(sockets[0]); code(); @@ -159,7 +159,7 @@ Session* Session::fork(std::function code) // static Session* Session::spawnv(const char *path, char *const argv[]) { - return Session::fork([&] { + return Session::fork([path, argv] { execv(path, argv); }); } @@ -167,7 +167,7 @@ Session* Session::spawnv(const char *path, char *const argv[]) // static Session* Session::spawnvp(const char *file, char *const argv[]) { - return Session::fork([&] { + return Session::fork([file, argv] { execvp(file, argv); }); } diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 3356c16cae..469386d11e 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -989,7 +989,7 @@ smx_actor_t simcall_process_create( if (name == nullptr) name = ""; smx_actor_t self = SIMIX_process_self(); - return simgrid::simix::kernelImmediate([&] { + return simgrid::simix::kernelImmediate([name, code, data, host, kill_time, properties, auto_restart, self] { return SIMIX_process_create(name, std::move(code), data, host, kill_time, properties, auto_restart, self); }); } diff --git a/src/simix/MailboxImpl.hpp b/src/simix/MailboxImpl.hpp index 0b27bd8cd4..16c7560124 100644 --- a/src/simix/MailboxImpl.hpp +++ b/src/simix/MailboxImpl.hpp @@ -19,7 +19,7 @@ namespace simix { class MailboxImpl { public: - MailboxImpl(const char* name) + explicit MailboxImpl(const char* name) : piface_(this), name_(xbt_strdup(name)), comm_queue(MAX_MAILBOX_SIZE), done_comm_queue(MAX_MAILBOX_SIZE) { } -- 2.20.1