Default is not to use sleep-set to agree with existing tests

[simgrid.git] / include / simgrid / simix.hpp

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index ac24d4f820231d385fb0152e70fdfa3286acf7b0..399d63fd22363e817ac063df7f5e2ef27ee83cac 100644 (file)
--- 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,7 +20,9 @@ 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::kernel::actor {
+namespace simgrid {
+namespace kernel {
+namespace actor {
 
 /** Execute some code in kernel context on behalf of the user code.
  *
@@ -62,7 +63,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.
@@ -83,7 +84,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.
@@ -114,6 +115,8 @@ 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();
 }
-} // namespace simgrid::kernel::actor
-
+// 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
 #endif