[TO DELETE] Mess with instr includes.

diff --git a/src/instr/instr_paje_containers.hpp b/src/instr/instr_paje_containers.hpp
index 957d498..01b2b78 100644 (file)
--- a/src/instr/instr_paje_containers.hpp
+++ b/src/instr/instr_paje_containers.hpp
@@ -6,8 +6,10 @@
 #ifndef INSTR_PAJE_CONTAINERS_HPP
 #define INSTR_PAJE_CONTAINERS_HPP
 
-#include "src/instr/instr_private.hpp"
+#include <map>
+#include <simgrid/s4u/Host.hpp>
 #include <string>
+#include <xbt/signal.hpp>
 
 namespace simgrid::instr {
 class Type;

diff --git a/src/instr/instr_paje_events.hpp b/src/instr/instr_paje_events.hpp
index ed12cd6..cfed7eb 100644 (file)
--- a/src/instr/instr_paje_events.hpp
+++ b/src/instr/instr_paje_events.hpp
@@ -6,15 +6,17 @@
 #ifndef INSTR_PAJE_EVENTS_HPP
 #define INSTR_PAJE_EVENTS_HPP
 
-#include "src/instr/instr_private.hpp"
+#include "src/instr/instr_paje_containers.hpp"
 #include "src/internal_config.h"
 #include <memory>
+#include <simgrid/engine.h>
 #include <sstream>
 #include <string>
 
 namespace simgrid::instr {
 class EntityValue;
 class TIData;
+class Type;
 
 enum class PajeEventType : unsigned int {
   DefineContainerType,
@@ -37,6 +39,10 @@ enum class PajeEventType : unsigned int {
   NewEvent
 };
 
+} // namespace simgrid::instr
+#include "src/instr/instr_private.hpp"
+namespace simgrid::instr {
+
 inline std::ostream& operator<<(std::ostream& os, PajeEventType event)
 {
   return os << static_cast<std::underlying_type_t<PajeEventType>>(event);

diff --git a/src/instr/instr_paje_types.hpp b/src/instr/instr_paje_types.hpp
index bdb16d4..1e0c76a 100644 (file)
--- a/src/instr/instr_paje_types.hpp
+++ b/src/instr/instr_paje_types.hpp
@@ -6,7 +6,8 @@
 #ifndef INSTR_PAJE_TYPES_HPP
 #define INSTR_PAJE_TYPES_HPP
 
-#include "src/instr/instr_private.hpp"
+#include "src/instr/instr_paje_events.hpp"
+#include <map>
 #include <memory>
 #include <string>
 #include <vector>
@@ -14,6 +15,8 @@
 namespace simgrid::instr {
 class ContainerType;
 class EventType;
+class VariableEvent;
+class StateEvent;
 
 long long int new_paje_id();
 

diff --git a/src/instr/instr_paje_values.hpp b/src/instr/instr_paje_values.hpp
index b080129..1d1e2c0 100644 (file)
--- a/src/instr/instr_paje_values.hpp
+++ b/src/instr/instr_paje_values.hpp
@@ -6,11 +6,14 @@
 #ifndef INSTR_PAJE_VALUES_HPP
 #define INSTR_PAJE_VALUES_HPP
 
-#include "src/instr/instr_private.hpp"
+#include "src/instr/instr_paje_types.hpp"
+#include <functional>
 #include <string>
 
 namespace simgrid::instr {
 
+long long int new_paje_id();
+
 class EntityValue {
   long long int id_ = new_paje_id();
   std::string name_;

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 091bbcc..808e7f5 100644 (file)
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -10,10 +10,6 @@
 
 #include "simgrid/instr.h"
 #include "simgrid/s4u/Actor.hpp"
-#include "src/instr/instr_paje_containers.hpp"
-#include "src/instr/instr_paje_events.hpp"
-#include "src/instr/instr_paje_types.hpp"
-#include "src/instr/instr_paje_values.hpp"
 
 #include <fstream>
 #include <iomanip> /** std::setprecision **/
@@ -230,6 +226,11 @@ public:
 };
 } // namespace simgrid::instr
 
+#include "src/instr/instr_paje_containers.hpp"
+#include "src/instr/instr_paje_events.hpp"
+#include "src/instr/instr_paje_types.hpp"
+#include "src/instr/instr_paje_values.hpp"
+
 XBT_PRIVATE std::string instr_pid(simgrid::s4u::Actor const& proc);
 
 /* from instr_config.c */