Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 5823a71..bedb0f8 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -38,7 +38,7 @@ class CpuAction;
 XBT_PUBLIC_CLASS CpuModel : public Model {
 public:
   CpuModel() : Model() {};
-  ~CpuModel() override;
+  ~CpuModel() = default;
 
   /**
    * @brief Create a Cpu
@@ -51,7 +51,6 @@ public:
 
   void updateActionsStateLazy(double now, double delta) override;
   void updateActionsStateFull(double now, double delta) override;
-  bool next_occuring_event_isIdempotent() override;
 };
 
 /************
@@ -105,7 +104,7 @@ public:
   virtual simgrid::surf::Action *sleep(double duration)=0;
 
   /** @brief Get the amount of cores */
-  virtual int getCoreCount();
+  virtual int coreCount();
 
   /** @brief Get the speed, accounting for the trace load and provided process load instead of the real current one */
   virtual double getSpeed(double load);