remove Jedule related stuff + fix SIMDAG_SRC->DAG_SRC issue

[simgrid.git] / include / simgrid / forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index dabba38..f5f5c6a 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -168,6 +168,8 @@ class CpuImpl;
 class Model;
 class Resource;
 class CpuModel;
+class HostImpl;
+class HostModel;
 class NetworkModel;
 class NetworkModelIntf;
 class LinkImpl;
@@ -176,6 +178,8 @@ class LinkImplIntf;
 class NetworkAction;
 class DiskImpl;
 class DiskModel;
+class VirtualMachineImpl;
+class VMModel;
 }
 namespace timer {
 class Timer;
@@ -190,17 +194,9 @@ class FutureEvtSet;
 class Profile;
 } // namespace profile
 } // namespace kernel
-namespace surf {
-  class HostImpl;
-  class HostModel;
-}
 namespace mc {
 class CommunicationDeterminismChecker;
 }
-namespace vm {
-class VMModel;
-class VirtualMachineImpl;
-} // namespace vm
 } // namespace simgrid
 
 using s4u_Actor             = simgrid::s4u::Actor;
@@ -225,7 +221,6 @@ using smx_cond_t     = simgrid::kernel::activity::ConditionVariableImpl*;
 using smx_mailbox_t  = simgrid::kernel::activity::MailboxImpl*;
 using smx_mutex_t    = simgrid::kernel::activity::MutexImpl*;
 using smx_sem_t      = simgrid::kernel::activity::SemaphoreImpl*;
-using e_smx_state_t XBT_ATTRIB_DEPRECATED_v330("Please use kernel::activity::State") = simgrid::kernel::activity::State;
 #else
 
 typedef struct s4u_Actor s4u_Actor;
@@ -242,7 +237,6 @@ typedef struct s4u_Semaphore s4u_Semaphore;
 typedef struct s4u_Disk s4u_Disk;
 typedef struct s4u_NetZone s4u_NetZone;
 typedef struct s4u_VM s4u_VM;
-XBT_ATTRIB_DEPRECATED_v330("Please stop using this type alias") typedef enum kernel_activity_state e_smx_state_t;
 
 typedef struct s_smx_timer* smx_timer_t;
 typedef struct s_smx_actor* smx_actor_t;