Remove unused typedefs.

[simgrid.git] / src / instr / instr_paje_events.hpp

diff --git a/src/instr/instr_paje_events.hpp b/src/instr/instr_paje_events.hpp
index ebdad78..c8fa8b2 100644 (file)
--- a/src/instr/instr_paje_events.hpp
+++ b/src/instr/instr_paje_events.hpp
@@ -12,6 +12,7 @@
 namespace simgrid {
 namespace instr {
 class EntityValue;
+class TIData;
 
 enum e_event_type : unsigned int {
   PAJE_DefineContainerType,
@@ -35,16 +36,18 @@ enum e_event_type : unsigned int {
 };
 
 class PajeEvent {
-protected:
-  Container* container;
-  Type* type;
+  Container* container_;
+  Type* type_;
 
+protected:
+  Type* getType() { return type_; }
+  Container* getContainer() { return container_; }
 public:
   double timestamp_;
   e_event_type eventType_;
   PajeEvent(Container* container, Type* type, double timestamp, e_event_type eventType)
-      : container(container), type(type), timestamp_(timestamp), eventType_(eventType){};
-  virtual ~PajeEvent();
+      : container_(container), type_(type), timestamp_(timestamp), eventType_(eventType){};
+  virtual ~PajeEvent() = default;
   virtual void print() = 0;
   void insertIntoBuffer();
 };
@@ -60,13 +63,12 @@ public:
 class StateEvent : public PajeEvent {
   EntityValue* value;
   std::string filename;
-  int linenumber;
-  void* extra_ = nullptr;
+  int linenumber = 0;
+  TIData* extra_ = nullptr;
 
 public:
-  StateEvent(double timestamp, Container* container, Type* type, e_event_type event_type, EntityValue* value);
-  StateEvent(double timestamp, Container* container, Type* type, e_event_type event_type, EntityValue* value,
-             void* extra);
+  StateEvent(Container* container, Type* type, e_event_type event_type, EntityValue* value);
+  StateEvent(Container* container, Type* type, e_event_type event_type, EntityValue* value, TIData* extra);
   void print() override;
 };
 
@@ -77,10 +79,10 @@ class LinkEvent : public PajeEvent {
   int size_ = -1;
 
 public:
-  LinkEvent(double timestamp, Container* container, Type* type, e_event_type event_type, Container* sourceContainer,
-            std::string value, std::string key);
-  LinkEvent(double timestamp, Container* container, Type* type, e_event_type event_type, Container* sourceContainer,
-            std::string value, std::string key, int size);
+  LinkEvent(Container* container, Type* type, e_event_type event_type, Container* sourceContainer, std::string value,
+            std::string key);
+  LinkEvent(Container* container, Type* type, e_event_type event_type, Container* sourceContainer, std::string value,
+            std::string key, int size);
   void print() override;
 };
 
@@ -93,5 +95,4 @@ public:
 };
 }
 }
-
 #endif