Merge remote-tracking branch 'upstream/master' into wifi_energy

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

diff --git a/src/smpi/include/smpi_f2c.hpp b/src/smpi/include/smpi_f2c.hpp
index 509771efedf10e22b2d3d9f364d4a522031b3fa1..d0889f1986d02cd3ae84b982a32d1f03cbd91370 100644 (file)
--- a/src/smpi/include/smpi_f2c.hpp
+++ b/src/smpi/include/smpi_f2c.hpp
@@ -1,6 +1,6 @@
-/* Handle Fortan - C conversion for MPI Types*/
+/* Handle Fortran - C conversion for MPI Types*/
 
-/* Copyright (c) 2010-2019. The SimGrid Team.
+/* Copyright (c) 2010-2020. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -23,18 +23,20 @@ class F2C {
     // Beware of collisions if id in mpif.h is not unique
     static std::unordered_map<std::string, F2C*>* f2c_lookup_;
     static int f2c_id_;
+    int my_f2c_id_ = -1;
+
   protected:
     static std::unordered_map<std::string, F2C*>* f2c_lookup();
     static void set_f2c_lookup(std::unordered_map<std::string, F2C*>* map);
     static int f2c_id();
     static void f2c_id_increment();
-    int my_f2c_id_;
+
   public:
     char* get_my_key(char* key);
     static char* get_key(char* key, int id);
     static void delete_lookup();
     static std::unordered_map<std::string, F2C*>* lookup();
-    F2C() : my_f2c_id_(-1){}
+    F2C() {}
     virtual ~F2C() = default;
 
     //Override these to handle specific values.