explicitly capture the variables to please sonar

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index 0906e7d..a39f436 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -136,7 +136,7 @@ void Engine::netpointRegister(simgrid::kernel::routing::NetPoint* point)
 /** @brief Unregister a given netpoint */
 void Engine::netpointUnregister(simgrid::kernel::routing::NetPoint* point)
 {
 /** @brief Unregister a given netpoint */
 void Engine::netpointUnregister(simgrid::kernel::routing::NetPoint* point)
 {

-  simgrid::simix::kernelImmediate([&] {
+  simgrid::simix::kernelImmediate([this, point] {

     pimpl->netpoints_.erase(point->name());
     delete point;
   });
     pimpl->netpoints_.erase(point->name());
     delete point;
   });

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 10eec1d..553f0bf 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -179,7 +179,9 @@ boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
 
 /** Get the properties assigned to a host */
 xbt_dict_t Host::properties() {
 
 /** Get the properties assigned to a host */
 xbt_dict_t Host::properties() {

-  return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getProperties(); });
+  return simgrid::simix::kernelImmediate([this] {
+    return this->pimpl_->getProperties();
+  });

 }
 
 /** Retrieve the property value (or nullptr if not set) */
 }
 
 /** Retrieve the property value (or nullptr if not set) */


@@ -187,13 +189,15 @@ const char*Host::property(const char*key) {
   return this->pimpl_->getProperty(key);
 }
 void Host::setProperty(const char*key, const char *value){
   return this->pimpl_->getProperty(key);
 }
 void Host::setProperty(const char*key, const char *value){

-  simgrid::simix::kernelImmediate([&] { this->pimpl_->setProperty(key, value); });
+  simgrid::simix::kernelImmediate([this, key, value] {
+    this->pimpl_->setProperty(key, value);
+  });

 }
 
 /** Get the processes attached to the host */
 xbt_swag_t Host::processes()
 {
 }
 
 /** Get the processes attached to the host */
 xbt_swag_t Host::processes()
 {

-  return simgrid::simix::kernelImmediate([&]() {
+  return simgrid::simix::kernelImmediate([this]() {

     return this->extension<simgrid::simix::Host>()->process_list;
   });
 }
     return this->extension<simgrid::simix::Host>()->process_list;
   });
 }


@@ -201,7 +205,7 @@ xbt_swag_t Host::processes()
 /** Get the peak power of a host */
 double Host::getPstateSpeedCurrent()
 {
 /** Get the peak power of a host */
 double Host::getPstateSpeedCurrent()
 {

-  return simgrid::simix::kernelImmediate([&] {
+  return simgrid::simix::kernelImmediate([this] {

     return this->pimpl_cpu->getPstateSpeedCurrent();
   });
 }
     return this->pimpl_cpu->getPstateSpeedCurrent();
   });
 }


@@ -209,7 +213,7 @@ double Host::getPstateSpeedCurrent()
 /** Get one power peak (in flops/s) of a host at a given pstate */
 double Host::getPstateSpeed(int pstate_index)
 {
 /** Get one power peak (in flops/s) of a host at a given pstate */
 double Host::getPstateSpeed(int pstate_index)
 {

-  return simgrid::simix::kernelImmediate([&] {
+  return simgrid::simix::kernelImmediate([this, pstate_index] {

     return this->pimpl_cpu->getPstateSpeed(pstate_index);
   });
 }
     return this->pimpl_cpu->getPstateSpeed(pstate_index);
   });
 }


@@ -226,7 +230,7 @@ int Host::coreCount() {
 /** @brief Set the pstate at which the host should run */
 void Host::setPstate(int pstate_index)
 {
 /** @brief Set the pstate at which the host should run */
 void Host::setPstate(int pstate_index)
 {

-  simgrid::simix::kernelImmediate([&](){
+  simgrid::simix::kernelImmediate([this, pstate_index](){

       this->pimpl_cpu->setPState(pstate_index);
   });
 }
       this->pimpl_cpu->setPState(pstate_index);
   });
 }


@@ -243,7 +247,9 @@ int Host::pstate()
  */
 xbt_dict_t Host::mountedStoragesAsDict()
 {
  */
 xbt_dict_t Host::mountedStoragesAsDict()
 {

-  return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getMountedStorageList(); });
+  return simgrid::simix::kernelImmediate([this] {
+    return this->pimpl_->getMountedStorageList();
+  });

 }
 
 /**
 }
 
 /**


@@ -253,7 +259,9 @@ xbt_dict_t Host::mountedStoragesAsDict()
  */
 xbt_dynar_t Host::attachedStorages()
 {
  */
 xbt_dynar_t Host::attachedStorages()
 {

-  return simgrid::simix::kernelImmediate([&] { return this->pimpl_->getAttachedStorageList(); });
+  return simgrid::simix::kernelImmediate([this] {
+    return this->pimpl_->getAttachedStorageList();
+  });

 }
 
 } // namespace simgrid
 }
 
 } // namespace simgrid

diff --git a/src/s4u/s4u_link.cpp b/src/s4u/s4u_link.cpp
index c7fb403..7f9802f 100644 (file)
--- a/src/s4u/s4u_link.cpp
+++ b/src/s4u/s4u_link.cpp
@@ -109,13 +109,13 @@ int Link::sharingPolicy()
 
 void Link::turnOn()
 {
 
 void Link::turnOn()
 {

-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this]() {

     this->pimpl_->turnOn();
   });
 }
 void Link::turnOff()
 {
     this->pimpl_->turnOn();
   });
 }
 void Link::turnOff()
 {

-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this]() {

     this->pimpl_->turnOff();
   });
 }
     this->pimpl_->turnOff();
   });
 }


@@ -126,26 +126,26 @@ void* Link::getData()
 }
 void Link::setData(void* d)
 {
 }
 void Link::setData(void* d)
 {

-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this, d]() {

     this->pimpl_->setData(d);
   });
 }
 
 void Link::setStateTrace(tmgr_trace_t trace)
 {
     this->pimpl_->setData(d);
   });
 }
 
 void Link::setStateTrace(tmgr_trace_t trace)
 {

-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this, trace]() {

     this->pimpl_->setStateTrace(trace);
   });
 }
 void Link::setBandwidthTrace(tmgr_trace_t trace)
 {
     this->pimpl_->setStateTrace(trace);
   });
 }
 void Link::setBandwidthTrace(tmgr_trace_t trace)
 {

-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this, trace]() {

     this->pimpl_->setBandwidthTrace(trace);
   });
 }
 void Link::setLatencyTrace(tmgr_trace_t trace)
 {
     this->pimpl_->setBandwidthTrace(trace);
   });
 }
 void Link::setLatencyTrace(tmgr_trace_t trace)
 {

-  simgrid::simix::kernelImmediate([&]() {
+  simgrid::simix::kernelImmediate([this, trace]() {

     this->pimpl_->setLatencyTrace(trace);
   });
 }
     this->pimpl_->setLatencyTrace(trace);
   });
 }

diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index ea2f37c..a1a0911 100644 (file)
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -42,7 +42,7 @@ NetZone::~NetZone()
 }
 std::unordered_map<std::string, std::string>* NetZone::properties()
 {
 }
 std::unordered_map<std::string, std::string>* NetZone::properties()
 {

-  return simgrid::simix::kernelImmediate([=] {
+  return simgrid::simix::kernelImmediate([this] {

       return &properties_;
   });
 }
       return &properties_;
   });
 }


@@ -54,7 +54,7 @@ const char* NetZone::property(const char* key)
 }
 void NetZone::setProperty(const char* key, const char* value)
 {
 }
 void NetZone::setProperty(const char* key, const char* value)
 {

-  simgrid::simix::kernelImmediate([=,&key,&value] {
+  simgrid::simix::kernelImmediate([this,key,value] {

     properties_[key] = value;
   });
 }
     properties_[key] = value;
   });
 }