Concatenate nested namespaces (sonar).

[simgrid.git] / src / s4u / s4u_Barrier.cpp

diff --git a/src/s4u/s4u_Barrier.cpp b/src/s4u/s4u_Barrier.cpp
index 297109e..b7f0c99 100644 (file)
--- a/src/s4u/s4u_Barrier.cpp
+++ b/src/s4u/s4u_Barrier.cpp
@@ -13,8 +13,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_barrier, s4u, "S4U barrier");
 
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
 
 /** @brief Create a new barrier
  *
@@ -42,7 +41,7 @@ int Barrier::wait()
         kernel::actor::simcall_answered([issuer, this] { return pimpl_->acquire_async(issuer); }, &lock_observer);
 
     kernel::actor::BarrierObserver wait_observer{issuer, mc::Transition::Type::BARRIER_WAIT, acquisition.get()};
-    return kernel::actor::simcall_blocking([issuer, acquisition] { return acquisition->wait_for(issuer, -1); },
+    return kernel::actor::simcall_blocking([issuer, acquisition] { acquisition->wait_for(issuer, -1); },
                                            &wait_observer);
 
   } else { // Do it in one simcall only
@@ -53,7 +52,7 @@ int Barrier::wait()
   }
 }
 
-std::string Barrier::to_string()
+std::string Barrier::to_string() const
 {
   return pimpl_->to_string();
 }
@@ -67,8 +66,7 @@ void intrusive_ptr_release(Barrier* barrier)
 {
   intrusive_ptr_release(barrier->pimpl_);
 }
-} // namespace s4u
-} // namespace simgrid
+} // namespace simgrid::s4u
 
 /* **************************** Public C interface *************************** */