X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..cb1f41e17133f75d16ce09edee442cda1ae579b6:/include/simgrid/simix.hpp

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index 9539451154..6e17fd6ebc 100644
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -34,8 +34,8 @@ namespace actor {
  *
  * It is highly inspired from the syscalls in a regular operating system, allowing the user code to get some specific
  * code executed in the kernel context. But here, there is almost no security involved. Parameters get checked for
- * finitness but that's all. The main goal remain to ensure reproductible ordering of uncomparable events (in [parallel]
- * simulation) and observability of events (in model-checking).
+ * finiteness but that's all. The main goal remain to ensure reproducible ordering of uncomparable events (in
+ * [parallel] simulation) and observability of events (in model-checking).
  *
  * The code passed as argument is supposed to terminate at the exact same simulated timestamp.
  * Do not use it if your code may block waiting for a subsequent event, e.g. if you lock a mutex,
@@ -45,7 +45,7 @@ namespace actor {
 template <class F> typename std::result_of<F()>::type simcall(F&& code, mc::SimcallInspector* t = nullptr)
 {
   // If we are in the maestro, we take the fast path and execute the
-  // code directly without simcall mashalling/unmarshalling/dispatch:
+  // code directly without simcall marshalling/unmarshalling/dispatch:
   if (SIMIX_is_maestro())
     return std::forward<F>(code)();
 
@@ -61,7 +61,7 @@ template <class F> typename std::result_of<F()>::type simcall(F&& code, mc::Simc
 /** 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
- * actor->simcall_answer() is called explicitely.
+ * actor->simcall_answer() is called explicitly.
  *
  * Since the return value does not come from the lambda directly, its type cannot be guessed automatically and must
  * be provided as template parameter.
@@ -78,7 +78,7 @@ template <class F> typename std::result_of<F()>::type simcall(F&& code, mc::Simc
 template <class R, class F> R simcall_blocking(F&& code, mc::SimcallInspector* t = nullptr)
 {
   // If we are in the maestro, we take the fast path and execute the
-  // code directly without simcall mashalling/unmarshalling/dispatch:
+  // code directly without simcall marshalling/unmarshalling/dispatch:
   if (SIMIX_is_maestro())
     return std::forward<F>(code)();
 
@@ -95,9 +95,6 @@ template <class R, class F> R simcall_blocking(F&& code, mc::SimcallInspector* t
 namespace simgrid {
 namespace simix {
 
-XBT_ATTRIB_DEPRECATED_v325("Please manifest if you actually need this function")
-    XBT_PUBLIC const std::vector<smx_actor_t>& process_get_runnable();
-
 // What's executed as SIMIX actor code:
 typedef std::function<void()> ActorCode;
 
@@ -127,18 +124,6 @@ public:
     return set(date, simgrid::xbt::Task<void()>(std::move(callback)));
   }
 
-  template <class R, class T>
-  XBT_ATTRIB_DEPRECATED_v325("Please use a lambda or std::bind") static inline Timer* set(double date,
-                                                                                          R (*callback)(T*), T* arg)
-  {
-    return set(date, std::bind(callback, arg));
-  }
-
-  XBT_ATTRIB_DEPRECATED_v325("Please use a lambda or std::bind") static Timer* set(double date, void (*callback)(void*),
-                                                                                   void* arg)
-  {
-    return set(date, std::bind(callback, arg));
-  }
   static Timer* set(double date, simgrid::xbt::Task<void()>&& callback);
   static double next() { return simix_timers.empty() ? -1.0 : simix_timers.top().first; }
 };
@@ -150,7 +135,4 @@ XBT_PUBLIC smx_actor_t simcall_process_create(const std::string& name, const sim
                                               void* data, sg_host_t host,
                                               std::unordered_map<std::string, std::string>* properties);
 
-XBT_ATTRIB_DEPRECATED_v325("Please use simgrid::xbt::Timer::set") XBT_PUBLIC smx_timer_t
-    SIMIX_timer_set(double date, simgrid::xbt::Task<void()>&& callback);
-
 #endif