Merge branch 'surf++'

[simgrid.git] / src / surf / workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 452e269..873cae5 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -11,10 +11,27 @@
 #include "storage_private.h"
 #include "surf/surf_resource.h"
 #include "simgrid/sg_config.h"
+<<<<<<< HEAD
+#include <inttypes.h>
+
+typedef struct workstation_CLM03 {
+  s_surf_resource_t generic_resource;   /* Must remain first to add this to a trace */
+  void *net_elm;
+  xbt_dynar_t storage;
+} s_workstation_CLM03_t, *workstation_CLM03_t;
+||||||| merged common ancestors
+
+typedef struct workstation_CLM03 {
+  s_surf_resource_t generic_resource;   /* Must remain first to add this to a trace */
+  void *net_elm;
+  xbt_dynar_t storage;
+} s_workstation_CLM03_t, *workstation_CLM03_t;
+=======
 #include "workstation_private.h"
 #include "vm_workstation_private.h"
 #include "cpu_cas01_private.h"
 #include "maxmin_private.h"
+>>>>>>> surf++
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
                                 "Logging specific to the SURF workstation module");