Merge s4u wait_any

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

diff --git a/src/surf/AsVivaldi.hpp b/src/surf/AsVivaldi.hpp
index 94504ea..a2ba680 100644 (file)
--- a/src/surf/AsVivaldi.hpp
+++ b/src/surf/AsVivaldi.hpp
@@ -9,15 +9,15 @@
 #include "src/surf/AsCluster.hpp"
 
 namespace simgrid {
-namespace surf {
+namespace routing {
 
 /* This derivates from cluster because each host has a private link */
 class XBT_PRIVATE AsVivaldi: public AsCluster {
 public:
   explicit AsVivaldi(const char *name);
-  ~AsVivaldi() {};
+  ~AsVivaldi() override;
 
-  xbt_dynar_t getOneLinkRoutes() override {return NULL;};
+  xbt_dynar_t getOneLinkRoutes() override {return nullptr;};
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
 };