move the simcall template to the kernel::actor namespace

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

diff --git a/include/simgrid/simix/blocking_simcall.hpp b/include/simgrid/simix/blocking_simcall.hpp
index d2c87da..c8ba0f7 100644 (file)
--- a/include/simgrid/simix/blocking_simcall.hpp
+++ b/include/simgrid/simix/blocking_simcall.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2016-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2016-2019. 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. */
@@ -33,7 +32,7 @@ XBT_PUBLIC void unblock(smx_actor_t process);
  * returns a `simgrid::kernel::Future<T>`. The kernel blocks the actor
  * until the Future is ready and:
  *
- *  - either returns the value wrapped in the future to the actor;
+ *  - either returns the value wrapped in the future to the actor
  *
  *  - or raises the exception stored in the future in the actor.
  *
@@ -70,15 +69,10 @@ template <class F> auto kernel_sync(F code) -> decltype(code().get())
   });
   return result.get();
 }
-template <class F>
-XBT_ATTRIB_DEPRECATED_v323("Please use simix::kernel_sync()") auto kernelSync(F code) -> decltype(code().get())
-{
-  return kernel_sync(code);
-}
 
 /** A blocking (`wait()`-based) future for SIMIX processes */
-// TODO, .wait_for()
-// TODO, .wait_until()
+// TODO, .wait_for
+// TODO, .wait_until
 // TODO, SharedFuture
 // TODO, simgrid::simix::when_all - wait for all future to be ready (this one is simple!)
 // TODO, simgrid::simix::when_any - wait for any future to be ready
@@ -155,16 +149,11 @@ template <class F> auto kernel_async(F code) -> Future<decltype(code().get())>
   typedef decltype(code().get()) T;
 
   // Execute the code in the kernel and get the kernel future:
-  simgrid::kernel::Future<T> future = simgrid::simix::simcall(std::move(code));
+  simgrid::kernel::Future<T> future = simgrid::kernel::actor::simcall(std::move(code));
 
   // Wrap the kernel future in a actor future:
   return simgrid::simix::Future<T>(std::move(future));
 }
-template <class F>
-XBT_ATTRIB_DEPRECATED_v323("Please use simix::kernel_sync()") auto kernelAsync(F code) -> Future<decltype(code().get())>
-{
-  return kernel_async(code);
-}
 }
 }