Merging changes done by Steven, Samuel and Luka, regarding simulation of StarPU-MPI

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

diff --git a/src/mc/Variable.hpp b/src/mc/Variable.hpp
index 9296f21e3fc236d99f6319cdf0066f0c4c3f30ac..5ca55ab08cb5d3226825ee6ab0911faa96a8819d 100644 (file)
--- a/src/mc/Variable.hpp
+++ b/src/mc/Variable.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,12 +9,15 @@
 
 #include <string>
 
-#include "mc_forward.h"
-#include "mc_location.h"
+#include <xbt/base.h>
+
+#include "src/mc/mc_forward.h"
+#include "src/mc/LocationList.hpp"
 
 namespace simgrid {
 namespace mc {
 
+/** A variable (global or local) in the model-checked program */
 class Variable {
 public:
   Variable();
@@ -26,7 +29,7 @@ public:
   simgrid::mc::Type* type;
 
   // Use either of:
-  simgrid::mc::LocationList location_list;
+  simgrid::dwarf::LocationList location_list;
   void* address;
 
   size_t start_scope;