Merge branch 'master' of https://github.com/mquinson/simgrid

diff --combined src/surf/network_interface.hpp
index f3b7c86,b18b487..93442c1
--- 1/src/surf/network_interface.hpp
--- 2/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@@ -232,7 -232,7 +232,7 @@@ public
    virtual int sharingPolicy();
  
    /** @brief Check if the Link is used */
 -  bool isUsed();
 +  bool isUsed() override;
  
    void turnOn() override;
    void turnOff() override;
@@@ -258,7 -258,7 +258,7 @@@ private
    static boost::unordered_map<std::string, Link *> *links;
  public:
    static Link *byName(const char* name);
-   static int linksAmount();
+   static int linksCount();
    static Link **linksList();
    static void linksExit();
  };