move VM into their namespace, and greatly reduce the amount of sg_host_get_name ...

[simgrid.git] / src / include / surf / surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index c8d7398..9ad9cc9 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -41,7 +41,6 @@ namespace surf {
 class Model;
 class CpuModel;
 class HostModel;
-class VMModel;
 class NetworkModel;
 class StorageModel;
 class Resource;
@@ -52,6 +51,9 @@ class Action;
 class ActionLmm;
 class StorageActionLmm;
 }
+namespace vm {
+class VMModel; // FIXME: KILLME
+}
 namespace kernel {     
 namespace routing {
 class RoutingPlatf;
@@ -62,7 +64,7 @@ class RoutingPlatf;
 typedef simgrid::surf::Model surf_Model;
 typedef simgrid::surf::CpuModel surf_CpuModel;
 typedef simgrid::surf::HostModel surf_HostModel;
-typedef simgrid::surf::VMModel surf_VMModel;
+typedef simgrid::vm::VMModel surf_VMModel;
 typedef simgrid::surf::NetworkModel surf_NetworkModel;
 typedef simgrid::surf::StorageModel surf_StorageModel;
 typedef simgrid::surf::Resource surf_Resource;