Merge branch 'master' of framagit.org:simgrid/simgrid

diff --git a/src/surf/link_wifi.hpp b/src/surf/link_wifi.hpp
index 9a64350..20f4179 100644 (file)
--- a/src/surf/link_wifi.hpp
+++ b/src/surf/link_wifi.hpp
@@ -20,7 +20,7 @@ class NetworkWifiLink : public NetworkCm02Link {
   std::map<xbt::string, int> host_rates;
 
   /** @brief Hold every rates available for this Access Point */
-  double* rates;
+  // double* rates; FIXME: unused
 
 public:
   void set_host_rate(sg_host_t host, int rate_level);

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 858fabc..04c57b0 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -341,6 +341,7 @@ set(SURF_SRC
   src/surf/cpu_ti.cpp
   src/surf/network_cm02.cpp
   src/surf/link_wifi.cpp
+  src/surf/link_wifi.hpp
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
   src/surf/PropertyHolder.cpp