X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6051c95412884222a64b2aac0e9416990e2d1577..867023cb5ee8dfd55f6c89642da42c3107024b7b:/src/instr/instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index de371d1bf0..c9b9a11cca 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2017. 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. */
@@ -88,7 +87,7 @@ typedef enum {
 
 typedef struct s_container *container_t;
 typedef struct s_container {
-  sg_netcard_t netcard;
+  sg_netpoint_t netpoint;
   char *name;     /* Unique name of this container */
   char *id;       /* Unique id of this container */
   type_t type;    /* Type of this container */
@@ -98,14 +97,20 @@ typedef struct s_container {
   xbt_dict_t children;
 }s_container_t;
 
-typedef struct paje_event *paje_event_t;
-typedef struct paje_event {
+class paje_event;
+
+typedef paje_event *paje_event_t;
+
+class paje_event {
+  public:
   double timestamp;
   e_event_type event_type;
   void (*print) (paje_event_t event);
   void (*free) (paje_event_t event);
   void *data;
-} s_paje_event_t;
+};
+
+typedef paje_event s_paje_event_t;
 
 typedef struct s_defineContainerType *defineContainerType_t;
 typedef struct s_defineContainerType {
@@ -455,4 +460,4 @@ typedef struct s_instr_extra_data {
 
 SG_END_DECL()
 
-#endif /* INSTR_PRIVATE_H_ */
+#endif