[mc] Member initialization in Variable, Member, Type

diff --git a/src/mc/Type.hpp b/src/mc/Type.hpp
index 819cf81..5a6a2ad 100644 (file)
--- a/src/mc/Type.hpp
+++ b/src/mc/Type.hpp
@@ -24,14 +24,14 @@ namespace mc {
  */
 class Member {
 public:
-  Member() : inheritance(false), byte_size(0), type_id(0) {}
+  Member() {}
 
-  bool inheritance;
+  bool inheritance = false;
   std::string name;
   simgrid::dwarf::DwarfExpression location_expression;
-  std::size_t byte_size; // Do we really need this?
-  unsigned type_id;
-  simgrid::mc::Type* type;
+  std::size_t byte_size = 0; // Do we really need this?
+  unsigned type_id = 0;
+  simgrid::mc::Type* type = nullptr;
 
   bool has_offset_location() const
   {
@@ -58,39 +58,26 @@ public:
 /** A type in the model-checked program */
 class Type {
 public:
-  Type();
+  Type() {}
   Type(Type const& type) = default;
   Type& operator=(Type const&) = default;
   Type(Type&& type) = default;
   Type& operator=(Type&&) = default;
 
   /** The DWARF TAG of the type (e.g. DW_TAG_array_type) */
-  int type;
-  unsigned id; /* Offset in the section (in hexadecimal form) */
+  int type = 0;
+  unsigned id = 0; /* Offset in the section (in hexadecimal form) */
   std::string name; /* Name of the type */
-  int byte_size; /* Size in bytes */
-  int element_count; /* Number of elements for array type */
-  unsigned type_id; /* DW_AT_type id */
+  int byte_size = 0; /* Size in bytes */
+  int element_count = 0; /* Number of elements for array type */
+  unsigned type_id = 0; /* DW_AT_type id */
   std::vector<Member> members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/
-  int is_pointer_type;
+  int is_pointer_type = 0;
 
-  simgrid::mc::Type* subtype; // DW_AT_type
-  simgrid::mc::Type* full_type; // The same (but more complete) type
+  simgrid::mc::Type* subtype = nullptr; // DW_AT_type
+  simgrid::mc::Type* full_type = nullptr; // The same (but more complete) type
 };
 
-inline
-Type::Type()
-{
-  this->type = 0;
-  this->id = 0;
-  this->byte_size = 0;
-  this->element_count = 0;
-  this->is_pointer_type = 0;
-  this->type_id = 0;
-  this->subtype = nullptr;
-  this->full_type = nullptr;
-}
-
 }
 }
 

diff --git a/src/mc/Variable.hpp b/src/mc/Variable.hpp
index 5ca55ab..5b82b6c 100644 (file)
--- a/src/mc/Variable.hpp
+++ b/src/mc/Variable.hpp
@@ -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;
-}
-
 }
 }