From: Millian Poquet <millian.poquet@inria.fr>
Date: Mon, 18 Jan 2016 23:01:08 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/mquinson/simgrid
X-Git-Tag: v3_13~1210^2^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1046c9806a7cdd50272c2dafe8ec13f48bd58b92?hp=-c

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

1046c9806a7cdd50272c2dafe8ec13f48bd58b92
diff --combined src/surf/network_interface.hpp
index f3b7c861bc,b18b487d66..93442c15bb
--- a/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();
  };