pull up two more methods in the surf::Host hierarchy

[simgrid.git] / src / surf / cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 772e86a..f9f6a12 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -22,7 +22,7 @@ namespace surf {
 
 simgrid::xbt::Extension<simgrid::Host, Cpu> Cpu::EXTENSION_ID;
 
-void Cpu::init()
+void Cpu::classInit()
 {
   if (!EXTENSION_ID.valid())
     EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Cpu>();
@@ -189,14 +189,8 @@ Cpu::Cpu(Model *model, const char *name,
 : Cpu(model, name, core, speedPeak, speedScale, SURF_RESOURCE_ON)
 {}
 
-void Cpu::onDie()
-{
-  Resource::onDie();
-}
-
 Cpu::~Cpu()
 {
-  this->die();
   if (p_constraintCoreId){
     for (int i = 0; i < m_core; i++) {
          xbt_free(p_constraintCoreId[i]);