do not include msg from s4u and surf

diff --git a/include/simgrid/zone.h b/include/simgrid/zone.h
index bd7bf72..4dac581 100644 (file)
--- a/include/simgrid/zone.h
+++ b/include/simgrid/zone.h
@@ -10,6 +10,7 @@
 
 #include <simgrid/forward.h>
 #include <xbt/base.h>
 
 #include <simgrid/forward.h>
 #include <xbt/base.h>

+#include <xbt/dict.h>

 
 /* C interface */
 SG_BEGIN_DECL()
 
 /* C interface */
 SG_BEGIN_DECL()

diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index 5895951..b17967d 100644 (file)
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -4,13 +4,13 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/kernel/routing/NetPoint.hpp"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/kernel/routing/NetPoint.hpp"

-#include "simgrid/msg.h"

 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/simix.hpp"
 #include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
 #include "xbt/log.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/simix.hpp"
 #include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
 #include "xbt/log.h"

+#include <simgrid/zone.h>

 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");
 

diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp
index 502b556..fe8d8ff 100644 (file)
--- a/src/s4u/s4u_storage.cpp
+++ b/src/s4u/s4u_storage.cpp
@@ -4,12 +4,12 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/kernel/resource/Resource.hpp"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/kernel/resource/Resource.hpp"

-#include "simgrid/msg.h"

 #include "simgrid/plugins/file_system.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.hpp"
 #include "simgrid/plugins/file_system.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.hpp"

+#include "simgrid/storage.h"

 #include "src/surf/StorageImpl.hpp"
 #include <unordered_map>
 
 #include "src/surf/StorageImpl.hpp"
 #include <unordered_map>
 

diff --git a/src/surf/plugins/host_dvfs.cpp b/src/surf/plugins/host_dvfs.cpp
index fd3a238..555d67a 100644 (file)
--- a/src/surf/plugins/host_dvfs.cpp
+++ b/src/surf/plugins/host_dvfs.cpp
@@ -12,7 +12,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>

-#include <simgrid/msg.h>

 #include <simgrid/s4u/Engine.hpp>
 #include <string>
 #include <utility>
 #include <simgrid/s4u/Engine.hpp>
 #include <string>
 #include <utility>