do not load a private header from s/k/resource/ headers

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

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 58e8ce9..198dd8a 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -26,11 +25,13 @@ namespace simgrid {
      *********/
     class NetworkConstantModel : public NetworkModel {
     public:
-      Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, double rate) override;
+      kernel::resource::Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size,
+                                            double rate) override;
       double nextOccuringEvent(double now) override;
       void updateActionsState(double now, double delta) override;
 
-      Link* createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override;
+      LinkImpl* createLink(const std::string& name, double bw, double lat,
+                           e_surf_link_sharing_policy_t policy) override;
     };
 
     /**********
@@ -41,6 +42,7 @@ namespace simgrid {
       NetworkConstantAction(NetworkConstantModel *model_, double size, double latency);
       ~NetworkConstantAction();
       double initialLatency_;
+      void updateRemainingLazy(double now) override;
     };
 
   }