X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d95b38c3d4b2911e3cc466e49ca9efbf58e997b..40ee10e13b61bfb28374d96ade010a262b5abd44:/include/simgrid/simix.hpp

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index 87b82b9743..338c3372ae 100644
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2022. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -21,9 +20,7 @@ XBT_PUBLIC void simcall_run_blocking(std::function<void()> const& code,
 XBT_PUBLIC void simcall_run_object_access(std::function<void()> const& code,
                                           simgrid::kernel::actor::ObjectAccessSimcallItem* item);
 
-namespace simgrid {
-namespace kernel {
-namespace actor {
+namespace simgrid::kernel::actor {
 
 /** Execute some code in kernel context on behalf of the user code.
  *
@@ -64,7 +61,7 @@ template <class F> typename std::result_of_t<F()> simcall_answered(F&& code, Sim
  *
  * Simulation without MC and without parallelism (contexts/nthreads=1) will not pay the price of a simcall for an
  * harmless setter. When running in parallel, you want your write access to be done in a mutual exclusion way, while the
- * getters can still occure out of order.
+ * getters can still occur out of order.
  *
  * When running in MC, you want to make this access visible to the checker. Actually in this case, it's not visible from
  * the checker (and thus still use a fast track) if the setter is called from the actor that created the object.
@@ -85,7 +82,7 @@ template <class F> typename std::result_of_t<F()> simcall_object_access(ObjectAc
 
 /** Execute some code (that does not return immediately) in kernel context
  *
- * This is very similar to simcall() right above, but the calling actor will not get rescheduled until
+ * This is very similar to simcall_answered() above, but the calling actor will not get rescheduled until
  * actor->simcall_answer() is called explicitly.
  *
  * This is meant for blocking actions. For example, locking a mutex is a blocking simcall.
@@ -116,8 +113,5 @@ auto simcall_blocking(F&& code, Observer* observer) -> decltype(observer->get_re
   simcall_blocking(std::forward<F>(code), static_cast<SimcallObserver*>(observer));
   return observer->get_result();
 }
-// compact namespaces are C++17 and this is a public header file so let's stick to C++14
-} // namespace actor
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::actor
 #endif