Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / src / smpi / internals / smpi_host.cpp

diff --git a/src/smpi/internals/smpi_host.cpp b/src/smpi/internals/smpi_host.cpp
index e3ed322..d8daf0d 100644 (file)
--- a/src/smpi/internals/smpi_host.cpp
+++ b/src/smpi/internals/smpi_host.cpp
@@ -29,16 +29,14 @@ void smpi_cleanup_op_cost_callback()
   cost_cbs.clear();
 }
 
-namespace simgrid {
-namespace smpi {
+namespace simgrid::smpi {
 
 xbt::Extension<s4u::Host, smpi::Host> Host::EXTENSION_ID;
 
 double Host::orecv(size_t size, s4u::Host* src, s4u::Host* dst)
 {
   /* return user's callback if available */
-  auto it = cost_cbs.find(SmpiOperation::RECV);
-  if (it != cost_cbs.end())
+  if (auto it = cost_cbs.find(SmpiOperation::RECV); it != cost_cbs.end())
     return it->second(size, src, dst);
 
   /* fallback to smpi/or config */
@@ -66,8 +64,7 @@ double Host::orecv(size_t size, s4u::Host* src, s4u::Host* dst)
 double Host::osend(size_t size, s4u::Host* src, s4u::Host* dst)
 {
   /* return user's callback if available */
-  auto it = cost_cbs.find(SmpiOperation::SEND);
-  if (it != cost_cbs.end())
+  if (auto it = cost_cbs.find(SmpiOperation::SEND); it != cost_cbs.end())
     return it->second(size, src, dst);
 
   /* fallback to smpi/os config */
@@ -94,8 +91,7 @@ double Host::osend(size_t size, s4u::Host* src, s4u::Host* dst)
 double Host::oisend(size_t size, s4u::Host* src, s4u::Host* dst)
 {
   /* return user's callback if available */
-  auto it = cost_cbs.find(SmpiOperation::ISEND);
-  if (it != cost_cbs.end())
+  if (auto it = cost_cbs.find(SmpiOperation::ISEND); it != cost_cbs.end())
     return it->second(size, src, dst);
 
   /* fallback to smpi/ois config */
@@ -158,5 +154,4 @@ Host::Host(s4u::Host* ptr) : host(ptr)
   }
 }
 
-} // namespace smpi
-} // namespace simgrid
+} // namespace simgrid::smpi