[mc] OOPify/C++ify ObjectInformation

[simgrid.git] / src / mc / mc_snapshot.h

diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index 85683f7..fc2ea78 100644 (file)
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -4,8 +4,8 @@
 /* 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. */
 
-#ifndef MC_SNAPSHOT_H
-#define MC_SNAPSHOT_H
+#ifndef SIMGRID_MC_SNAPSHOT_H
+#define SIMGRID_MC_SNAPSHOT_H
 
 #include <sys/types.h> // off_t
 #include <stdint.h> // size_t
@@ -118,36 +118,12 @@ typedef struct s_local_variable{
   int region;
 } s_local_variable_t, *local_variable_t;
 
-typedef struct s_mc_snapshot_stack{
+typedef struct s_mc_snapshot_stack {
   std::vector<s_local_variable> local_variables;
-  mc_unw_context_t context;
-  xbt_dynar_t stack_frames; // mc_stack_frame_t
+  s_mc_unw_context_t context;
+  std::vector<s_mc_stack_frame_t> stack_frames;
   int process_index;
-
-  s_mc_snapshot_stack()
-    : context(nullptr), stack_frames(nullptr), process_index(0)
-  {}
-  ~s_mc_snapshot_stack();
-  s_mc_snapshot_stack(s_mc_snapshot_stack& p) = delete;
-  s_mc_snapshot_stack& operator=(s_mc_snapshot_stack&) = delete;
-
-  s_mc_snapshot_stack(s_mc_snapshot_stack&& that)
-  {
-    *this = std::move(that);
-  }
-  s_mc_snapshot_stack& operator=(s_mc_snapshot_stack&& that)
-  {
-    this->local_variables = std::move(that.local_variables);
-    this->context = std::move(that.context);
-    that.context = nullptr;
-    this->stack_frames = std::move(that.stack_frames);
-    that.stack_frames = nullptr;
-    this->process_index = that.process_index;
-    that.process_index = 0;
-    return *this;
-  }
-
-}s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
+} s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
 
 typedef struct s_mc_global_t {
   mc_snapshot_t snapshot;