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

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

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 06ae981c44892d2590649364b76c3b0a04f388b8..84593b513e4d2e464790606d9fdcfeb2f150d539 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -197,7 +197,7 @@ public:
    * @brief share the resources
    * @details Share the resources between the actions 
    * 
-   * @param 
+   * @param now [TODO]
    * @return the date of the next action will finish
    */
   virtual double shareResources(double now);
@@ -360,15 +360,13 @@ public:
    */
   virtual void setState(e_surf_resource_state_t state);
 
-protected:
-  e_surf_resource_state_t m_stateCurrent;
-
 private:
   const char *p_name;
   xbt_dict_t p_properties;
   ModelPtr p_model;
   void *p_resource;
   bool m_running;
+  e_surf_resource_state_t m_stateCurrent;
 
   /* LMM */
 public:
@@ -439,7 +437,7 @@ public:
    * 
    * @param state The new state of the current Action
    */
-  virtual void setState(e_surf_action_state_t state); /**< Change state*/
+  virtual void setState(e_surf_action_state_t state);
 
   /**
    * @brief Get the bound of the current Action