Merge s4u wait_any

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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 0392c29..3819984 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -44,7 +44,7 @@ namespace simgrid {
           xbt_dict_t properties) override;
       void updateActionsStateLazy(double now, double delta) override;
       void updateActionsStateFull(double now, double delta) override;
-      Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
+      Action *communicate(routing::NetCard *src, routing::NetCard *dst, double size, double rate) override;
       bool next_occuring_event_isIdempotent() override;
       virtual void gapAppend(double size, const Link* link, NetworkAction* action);
     protected:
@@ -72,7 +72,7 @@ namespace simgrid {
      * Action *
      **********/
     class NetworkCm02Action : public NetworkAction {
-      friend Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, double size, double rate);
+      friend Action *NetworkCm02Model::communicate(routing::NetCard *src, routing::NetCard *dst, double size, double rate);
       friend NetworkSmpiModel;
     public:
       NetworkCm02Action(Model *model, double cost, bool failed)