[s4u] Don't handle -1 specially in ConditionVariable::wait_for()

[simgrid.git] / src / surf / AsClusterFatTree.cpp

diff --git a/src/surf/AsClusterFatTree.cpp b/src/surf/AsClusterFatTree.cpp
index 263d2d5..18df2ff 100644 (file)
--- a/src/surf/AsClusterFatTree.cpp
+++ b/src/surf/AsClusterFatTree.cpp
@@ -3,6 +3,9 @@
 /* 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. */
 
+#include <fstream>
+#include <sstream>
+
 #include "src/surf/AsClusterFatTree.hpp"
 #include "src/surf/network_interface.hpp"
 
@@ -11,17 +14,13 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
-
 #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_fat_tree, surf, "Routing for fat trees");
 
 namespace simgrid {
-namespace surf {
+namespace routing {
 
 AsClusterFatTree::AsClusterFatTree(const char*name)
   : AsCluster(name)