From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 21 Dec 2015 21:53:43 +0000 (+0100)
Subject: cosmetics
X-Git-Tag: v3_13~1414
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/01f0c436719fd79cf75643e254bc04011bcdcce8

cosmetics
---

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 9b00223782..d707b3e8c3 100644
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -80,7 +80,7 @@ void sg_host_init()
   });
   SD_HOST_LEVEL = simgrid::Host::extension_create(__SD_workstation_destroy);
   SIMIX_HOST_LEVEL = simgrid::Host::extension_create(SIMIX_host_destroy);
-  simgrid::surf::Cpu::init();
+  simgrid::surf::Cpu::classInit();
   ROUTING_HOST_LEVEL = simgrid::Host::extension_create(routing_asr_host_free);
   USER_HOST_LEVEL = simgrid::Host::extension_create(NULL);
 }
diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index ea7f63e37a..f9f6a12ea5 100644
--- 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>();
diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index bdbbe642ac..ff5b3c1210 100644
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -81,7 +81,7 @@ public:
 XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource {
 public:
   static simgrid::xbt::Extension<simgrid::Host, Cpu> EXTENSION_ID;
-  static void init();
+  static void classInit();
   Cpu();
 
   /**