kill dead code in Cpu constructors

diff --git a/.cproject b/.cproject
index ebbd921..95f8918 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -18,7 +18,7 @@
                                        <folderInfo id="cdt.managedbuild.toolchain.gnu.base.1011977604.157358594" name="/" resourcePath="">
                                                <toolChain id="cdt.managedbuild.toolchain.gnu.base.368132295" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
                                                        <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1122260779" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
-                                                       <builder buildPath="${workspace_loc:/simgrid}/build/simple" id="cdt.managedbuild.target.gnu.builder.base.1747533038" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+                                                       <builder buildPath="${workspace_loc:/simgrid}/" id="cdt.managedbuild.target.gnu.builder.base.1747533038" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
                                                        <tool id="cdt.managedbuild.tool.gnu.archiver.base.374652938" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
                                                        <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.738159103" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
                                                                <option id="gnu.cpp.compiler.option.include.paths.216814103" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index f362818..232e381 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -131,12 +131,6 @@ void CpuModel::updateActionsStateFull(double now, double delta)
 /************
  * Resource *
  ************/
-Cpu::Cpu()
-{
-       xbt_die("FIXME: DEADCODE");
-}
-
-
 Cpu::Cpu(Model *model, simgrid::Host *host,
             xbt_dynar_t speedPeakList, int pstate,
                 int core, double speedPeak, double speedScale,
@@ -185,22 +179,6 @@ Cpu::Cpu(Model *model, simgrid::Host *host, lmm_constraint_t constraint,
   }
 }
 
-Cpu::Cpu(Model *model, simgrid::Host *host, lmm_constraint_t constraint,
-  xbt_dynar_t speedPeakList, int pstate,
-  int core, double speedPeak, double speedScale)
-: Cpu(model, host, constraint, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON)
-{
-       xbt_die("FIXME: DEADCODE");
-}
-
-Cpu::Cpu(Model *model, simgrid::Host *host,
-  xbt_dynar_t speedPeakList, int pstate,
-  int core, double speedPeak, double speedScale)
-: Cpu(model, host, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON)
-{
-       xbt_die("FIXME: DEADCODE");
-}
-
 Cpu::~Cpu()
 {
   if (p_constraintCoreId){

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 2cb2d53..147d3bd 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -74,8 +74,6 @@ public:
 */
 XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource {
 public:
-  Cpu();
-
   /**
    * @brief Cpu constructor
    *
@@ -107,13 +105,6 @@ public:
          int core, double speedPeak, double speedScale,
          e_surf_resource_state_t stateInitial);
 
-  Cpu(simgrid::surf::Model *model, simgrid::Host *host, lmm_constraint_t constraint,
-         xbt_dynar_t speedPeakList, int pstate,
-         int core, double speedPeak, double speedScale);
-  Cpu(simgrid::surf::Model *model, simgrid::Host *host,
-         xbt_dynar_t speedPeakList, int pstate,
-         int core, double speedPeak, double speedScale);
-
   ~Cpu();
 
   /**

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 9d6d922..5993c7d 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -114,7 +114,6 @@ typedef boost::intrusive::list<
  ************/
 class CpuTi : public Cpu {
 public:
-  CpuTi() {};
   CpuTi(CpuTiModel *model, simgrid::Host *host, xbt_dynar_t speedPeak,
         int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
         e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace) ;