kill unused constructors of Resources and other cleanups

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

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 732406df3ecac5daa1a23a1420bbcc56a191f9eb..b5c3a805fe5ddf49f4f9801ea03ca766d1a3debb 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -558,66 +558,51 @@ namespace simgrid {
 namespace surf {
 
 Resource::Resource(Model *model, const char *name)
-  : Resource(model, name, 1/*ON*/)
+  : name_(xbt_strdup(name))
+  , model_(model)
 {}
 
 Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint)
-  : Resource(model, name, constraint, 1/*ON*/)
-{}
-  
-Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint, int initiallyOn)
-  : p_name(xbt_strdup(name))
-  , p_model(model)
-  , m_isOn(initiallyOn)
-  , p_constraint(constraint)
-{}
-
-Resource::Resource(Model *model, const char *name, int initiallyOn)
-  : p_name(xbt_strdup(name))
-  , p_model(model)
-  , m_isOn(initiallyOn)
+  : name_(xbt_strdup(name))
+  , model_(model)
+  , constraint_(constraint)
 {}
 
-
 Resource::~Resource() {
-  xbt_free((void*)p_name);
+  xbt_free((void*)name_);
 }
 
-bool Resource::isOn() {
-  return m_isOn;
+bool Resource::isOn() const {
+  return isOn_;
 }
-bool Resource::isOff() {
-  return ! m_isOn;
+bool Resource::isOff() const {
+  return ! isOn_;
 }
 
 void Resource::turnOn()
 {
-  if (!m_isOn) {
-    m_isOn = true;
-  }
+  isOn_ = true;
 }
 
 void Resource::turnOff()
 {
-  if (m_isOn) {
-    m_isOn = false;
-  }
+  isOn_ = false;
 }
 
 Model *Resource::getModel() const {
-  return p_model;
+  return model_;
 }
 
 const char *Resource::getName() const {
-  return p_name;
+  return name_;
 }
 
 bool Resource::operator==(const Resource &other) const {
-  return strcmp(p_name, other.p_name);
+  return strcmp(name_, other.name_);
 }
 
-lmm_constraint_t Resource::getConstraint() {
-  return p_constraint;
+lmm_constraint_t Resource::getConstraint() const {
+  return constraint_;
 }
 
 }