[mc] Remove mc_object_info.cpp

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index d72eaf8..b0c4ca5 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -622,7 +622,6 @@ set(MC_SRC
   src/mc/mc_unw_vmread.cpp
   src/mc/mc_mmalloc.h
   src/mc/mc_object_info.h
-  src/mc/mc_object_info.cpp
   src/mc/mc_checkpoint.cpp
   src/mc/mc_snapshot.h
   src/mc/mc_snapshot.cpp

diff --git a/src/mc/Frame.hpp b/src/mc/Frame.hpp
index bdbbbca..734b933 100644 (file)
--- a/src/mc/Frame.hpp
+++ b/src/mc/Frame.hpp
@@ -11,6 +11,8 @@
 
 #include "mc_forward.h"
 #include "mc_location.h"
+#include "mc/Variable.hpp"
+#include "mc/Frame.hpp"
 
 namespace simgrid {
 namespace mc {
@@ -31,6 +33,17 @@ public:
   simgrid::mc::ObjectInformation* object_info;
 };
 
+inline
+Frame::Frame()
+{
+  this->tag = 0;
+  this->low_pc = nullptr;
+  this->high_pc = nullptr;
+  this->id = 0;
+  this->abstract_origin_id = 0;
+  this->object_info = nullptr;
+}
+
 }
 }
 

diff --git a/src/mc/Type.hpp b/src/mc/Type.hpp
index 287a679..46a0516 100644 (file)
--- a/src/mc/Type.hpp
+++ b/src/mc/Type.hpp
@@ -66,6 +66,19 @@ public:
   }
 };
 
+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 ec1e071..9296f21 100644 (file)
--- a/src/mc/Variable.hpp
+++ b/src/mc/Variable.hpp
@@ -33,6 +33,18 @@ public:
   simgrid::mc::ObjectInformation* object_info;
 };
 
+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;
+}
+
 }
 }
 

diff --git a/src/mc/mc_object_info.cpp b/src/mc/mc_object_info.cpp
deleted file mode 100644 (file)
index dfab094..0000000
--- a/src/mc/mc_object_info.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (c) 2014-2015. 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 <stddef.h>
-
-#include <xbt/dynar.h>
-
-#include "mc_object_info.h"
-#include "mc_private.h"
-#include "mc/Frame.hpp"
-#include "mc/Type.hpp"
-#include "mc/Variable.hpp"
-
-namespace simgrid {
-namespace mc {
-
-// Type
-
-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;
-}
-
-// Type
-
-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;
-}
-
-// Frame
-
-Frame::Frame()
-{
-  this->tag = 0;
-  this->low_pc = nullptr;
-  this->high_pc = nullptr;
-  this->id = 0;
-  this->abstract_origin_id = 0;
-  this->object_info = nullptr;
-}
-
-}
-}
\ No newline at end of file