rename smx_process_t to smx_actor_t

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

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index a740981..b34c5bb 100644 (file)
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -1,21 +1,24 @@
-/* Copyright (c) 2007, 2009-2015. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2016. 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. */
 
+#include <string>
+#include <vector>
+
 #include "smx_private.h"
+#include <xbt/ex.hpp>
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
-                                "Logging specific to SIMIX (deployment)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
 
 extern int surf_parse_lineno;
 
-void SIMIX_init_application(void)
+void SIMIX_init_application()
 {
   sg_platf_exit();
   sg_platf_init();
@@ -38,8 +41,7 @@ void SIMIX_init_application(void)
 void SIMIX_launch_application(const char *file)
 {
   XBT_ATTRIB_UNUSED int parse_status;
-  xbt_assert(simix_global,
-              "SIMIX_global_init has to be called before SIMIX_launch_application.");
+  xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application.");
 
   SIMIX_init_application();
 
@@ -59,7 +61,7 @@ void SIMIX_launch_application(const char *file)
 // Wrap a main() function into a ActorCodeFactory:
 static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
 {
-  return [code](simgrid::xbt::args args) {
+  return [code](std::vector<std::string> args) {
     return simgrid::xbt::wrapMain(code, std::move(args));
   };
 }
@@ -92,12 +94,12 @@ void SIMIX_function_register_default(xbt_main_func_t code)
 }
 
 /**
- * \brief Gets a #smx_process_t code from the global table.
+ * \brief Gets a #smx_actor_t code from the global table.
  *
  * Gets a code function from the global table. Returns nullptr if there are no function registered with the name.
  * This table is then used by #SIMIX_launch_application.
  * \param name the reference name of the function.
- * \return The #smx_process_t or nullptr.
+ * \return The #smx_actor_t or nullptr.
  */
 simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name)
 {
@@ -161,4 +163,4 @@ void registerFunction(const char* name, ActorCodeFactory factory)
 }
 
 }
-}
\ No newline at end of file
+}