Hide a bit an internal datatype to please sonar

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 334caa1..94f5465 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -48,7 +48,6 @@ typedef simgrid::s4u::Link s4u_Link;
 typedef simgrid::s4u::NetZone s4u_NetZone;
 typedef simgrid::kernel::activity::ActivityImpl kernel_Activity;
 typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
-typedef simgrid::surf::Cpu surf_Cpu;
 typedef simgrid::surf::Resource surf_Resource;
 typedef simgrid::trace_mgr::trace tmgr_Trace;
 
@@ -59,7 +58,6 @@ typedef struct s4u_Host s4u_Host;
 typedef struct s4u_Link s4u_Link;
 typedef struct s4u_NetZone s4u_NetZone;
 typedef struct kernel_Activity kernel_Activity;
-typedef struct surf_Cpu surf_Cpu;
 typedef struct routing_NetPoint routing_NetPoint;
 typedef struct surf_Resource surf_Resource;
 typedef struct Trace tmgr_Trace;
@@ -72,7 +70,6 @@ typedef s4u_Link* sg_link_t;
 
 typedef kernel_Activity *smx_activity_t;
 
-typedef surf_Cpu *surf_cpu_t;
 typedef routing_NetPoint* sg_netpoint_t;
 typedef surf_Resource *sg_resource_t;
 

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index dae5142..addf3d5 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -55,6 +55,7 @@ class StorageActionLmm;
 
 typedef simgrid::surf::Model surf_Model;
 typedef simgrid::surf::CpuModel surf_CpuModel;
+typedef simgrid::surf::Cpu surf_Cpu;
 typedef simgrid::surf::HostModel surf_HostModel;
 typedef simgrid::surf::NetworkModel surf_NetworkModel;
 typedef simgrid::surf::StorageModel surf_StorageModel;
@@ -71,6 +72,7 @@ typedef simgrid::surf::StorageActionLmm surf_StorageActionLmm;
 
 typedef struct surf_Model surf_Model;
 typedef struct surf_CpuModel surf_CpuModel;
+typedef struct surf_Cpu surf_Cpu;
 typedef struct surf_HostModel surf_HostModel;
 typedef struct surf_NetworkModel surf_NetworkModel;
 typedef struct surf_StorageModel surf_StorageModel;
@@ -93,6 +95,7 @@ typedef struct surf_StorageActionLmm surf_StorageActionLmm;
  */
 typedef surf_Model *surf_model_t;
 typedef surf_CpuModel *surf_cpu_model_t;
+typedef surf_Cpu* surf_cpu_t;
 typedef surf_HostModel *surf_host_model_t;
 typedef surf_NetworkModel *surf_network_model_t;
 typedef surf_StorageModel *surf_storage_model_t;