Rename simgrid::exception into simgrid::Exception

[simgrid.git] / src / simix / smx_deployment.cpp

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index aece2e9..b549d91 100644 (file)
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -3,14 +3,14 @@
 /* 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. */
 
-#include <string>
-#include <vector>
-
+#include "simgrid/Exception.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "smx_private.hpp"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 #include <simgrid/engine.h>
-#include <xbt/ex.hpp>
+
+#include <string>
+#include <vector>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
 
@@ -67,6 +67,10 @@ static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
 {
   return [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(code, std::move(args)); };
 }
+static simgrid::simix::ActorCodeFactory toActorCodeFactory(void (*code)(std::vector<std::string>))
+{
+  return [code](std::vector<std::string> args) { return std::bind(std::move(code), std::move(args)); };
+}
 
 /**
  * @brief Registers a #xbt_main_func_t code in a global table.
@@ -78,8 +82,10 @@ static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
  */
 void SIMIX_function_register(std::string name, xbt_main_func_t code)
 {
-  xbt_assert(simix_global,
-    "SIMIX_global_init has to be called before SIMIX_function_register.");
+  simix_global->registered_functions[name] = toActorCodeFactory(code);
+}
+void SIMIX_function_register(std::string name, void (*code)(std::vector<std::string>))
+{
   simix_global->registered_functions[name] = toActorCodeFactory(code);
 }