[mc] Member initialization in Variable, Member, Type

[simgrid.git] / src / mc / Variable.hpp

diff --git a/src/mc/Variable.hpp b/src/mc/Variable.hpp
index 176cf46..5b82b6c 100644 (file)
--- a/src/mc/Variable.hpp
+++ b/src/mc/Variable.hpp
@@ -11,7 +11,7 @@
 
 #include <xbt/base.h>
 
-#include "mc_forward.h"
+#include "src/mc/mc_forward.h"
 #include "src/mc/LocationList.hpp"
 
 namespace simgrid {
@@ -20,34 +20,19 @@ namespace mc {
 /** A variable (global or local) in the model-checked program */
 class Variable {
 public:
-  Variable();
-
-  unsigned dwarf_offset; /* Global offset of the field. */
-  int global;
+  Variable() {}
+  unsigned dwarf_offset = 0; /* Global offset of the field. */
+  int global = 0;
   std::string name;
-  unsigned type_id;
-  simgrid::mc::Type* type;
-
+  unsigned type_id = 0;
+  simgrid::mc::Type* type = nullptr;
   // Use either of:
   simgrid::dwarf::LocationList location_list;
-  void* address;
-
-  size_t start_scope;
-  simgrid::mc::ObjectInformation* object_info;
+  void* address = nullptr;
+  size_t start_scope = 0;
+  simgrid::mc::ObjectInformation* object_info = nullptr;
 };
 
-inline
-Variable::Variable()
-{
-  this->dwarf_offset = 0;
-  this->global = 0;
-  this->type = nullptr;
-  this->type_id = 0;
-  this->address = nullptr;
-  this->start_scope = 0;
-  this->object_info = nullptr;
-}
-
 }
 }