SMPI init: stringify and rename a variable

[simgrid.git] / src / smpi / include / smpi_actor.hpp

diff --git a/src/smpi/include/smpi_actor.hpp b/src/smpi/include/smpi_actor.hpp
index 97d4d2b..a0ee3b2 100644 (file)
--- a/src/smpi/include/smpi_actor.hpp
+++ b/src/smpi/include/smpi_actor.hpp
@@ -31,8 +31,13 @@ class ActorExt {
   smpi_trace_call_location_t trace_call_loc_;
   s4u::ActorPtr actor_                           = nullptr;
   smpi_privatization_region_t privatized_region_ = nullptr;
-  int optind                                     = 1; /*for getopt replacement */
+#ifdef __linux__
+  int optind_                                     = 0; /*for getopt replacement */
+#else
+  int optind_                                     = 1; /*for getopt replacement */
+#endif
   std::string tracing_category_                  = "";
+  MPI_Info info_env_;
 
 #if HAVE_PAPI
   /** Contains hardware data as read by PAPI **/
@@ -44,7 +49,7 @@ public:
   ActorExt(const ActorExt&) = delete;
   ActorExt& operator=(const ActorExt&) = delete;
   ~ActorExt();
-  void set_data(const char* instance_id);
+  void set_data(const std::string& instance_id);
   void finalize();
   int finalized();
   int initializing();
@@ -77,6 +82,7 @@ public:
   s4u::ActorPtr get_actor();
   int get_optind();
   void set_optind(int optind);
+  MPI_Info info_env();
 };
 
 } // namespace smpi