another attempt at fixing the include madness in mc for Mac

diff --git a/src/mc/DwarfExpression.cpp b/src/mc/DwarfExpression.cpp
index 4f13379..8c7885b 100644 (file)
--- a/src/mc/DwarfExpression.cpp
+++ b/src/mc/DwarfExpression.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2014-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-2018. 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. */
 
 /* 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. */


@@ -7,10 +6,6 @@
 #include <cstddef>
 #include <cstdint>
 
 #include <cstddef>
 #include <cstdint>
 

-#include <dwarf.h>
-#include <elfutils/libdw.h>
-#include <libunwind.h>
-

 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/DwarfExpression.hpp"
 #include "src/mc/Frame.hpp"
 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/DwarfExpression.hpp"
 #include "src/mc/Frame.hpp"

diff --git a/src/mc/DwarfExpression.hpp b/src/mc/DwarfExpression.hpp
index 35227bc..2266e1c 100644 (file)
--- a/src/mc/DwarfExpression.hpp
+++ b/src/mc/DwarfExpression.hpp
@@ -14,9 +14,11 @@
 #include <vector>
 
 #include <elfutils/libdw.h>
 #include <vector>
 
 #include <elfutils/libdw.h>

+#include <libunwind.h>

 
 

-#include "src/mc/mc_forward.hpp"

 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/AddressSpace.hpp"

+#include "src/mc/mc_dwarf.hpp"
+#include "src/mc/mc_forward.hpp"

 
 /** @file DwarfExpression.hpp
  *
 
 /** @file DwarfExpression.hpp
  *

diff --git a/src/mc/LocationList.hpp b/src/mc/LocationList.hpp
index dc9e797..9eec0b1 100644 (file)
--- a/src/mc/LocationList.hpp
+++ b/src/mc/LocationList.hpp
@@ -6,14 +6,6 @@
 #ifndef SIMGRID_MC_OBJECT_LOCATION_H
 #define SIMGRID_MC_OBJECT_LOCATION_H
 
 #ifndef SIMGRID_MC_OBJECT_LOCATION_H
 #define SIMGRID_MC_OBJECT_LOCATION_H
 

-#include <cstdint>
-
-#include <vector>
-
-#include <libunwind.h>
-#include <dwarf.h>
-#include <elfutils/libdw.h>
-

 #include "xbt/base.h"
 #include "xbt/range.hpp"
 
 #include "xbt/base.h"
 #include "xbt/range.hpp"
 


@@ -21,6 +13,9 @@
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/DwarfExpression.hpp"
 
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/DwarfExpression.hpp"
 

+#include <cstdint>
+#include <vector>
+

 namespace simgrid {
 namespace dwarf {
 
 namespace simgrid {
 namespace dwarf {
 

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index c1968fc..b525f40 100644 (file)
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -10,13 +10,13 @@
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_replay.hpp"

-#include "src/mc/remote/RemoteClient.hpp"

 #include "src/simix/smx_private.hpp"
 
 #include "src/kernel/activity/MutexImpl.hpp"
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/ModelChecker.hpp"
 #include "src/simix/smx_private.hpp"
 
 #include "src/kernel/activity/MutexImpl.hpp"
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/ModelChecker.hpp"

+#include "src/mc/remote/RemoteClient.hpp"

 
 using simgrid::mc::remote;
 #endif
 
 using simgrid::mc::remote;
 #endif

diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index d97c710..26b5954 100644 (file)
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -14,8 +14,6 @@
 
 #include <fcntl.h>
 #include <cstdlib>
 
 #include <fcntl.h>
 #include <cstdlib>

-#define DW_LANG_Objc DW_LANG_ObjC       /* fix spelling error in older dwarf.h */
-#include <dwarf.h>

 #include <elfutils/libdw.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <elfutils/libdw.h>
 
 #include <boost/algorithm/string/predicate.hpp>