Reduce the amount of (protected) multiple includes

Move the #include within the multiple-inclusion protection.

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 0f925a1..ae9ce5d 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -4,17 +4,18 @@
 /* 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. */
 
+#ifndef SURF_NETWORK_INTERFACE_HPP_
+#define SURF_NETWORK_INTERFACE_HPP_
+
 #include <boost/unordered_map.hpp>
 
 #include "xbt/fifo.h"
+#include "xbt/dict.h"
 #include "surf_interface.hpp"
 #include "surf_routing.hpp"
 
 #include "simgrid/link.h"
 
-#ifndef SURF_NETWORK_INTERFACE_HPP_
-#define SURF_NETWORK_INTERFACE_HPP_
-
 /***********
  * Classes *
  ***********/

diff --git a/src/surf/surf_routing_cluster.hpp b/src/surf/surf_routing_cluster.hpp
index 5e834c1..e0f85d6 100644 (file)
--- a/src/surf/surf_routing_cluster.hpp
+++ b/src/surf/surf_routing_cluster.hpp
@@ -4,12 +4,12 @@
 /* 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 "surf_routing_none.hpp"
-#include "network_interface.hpp"
-
 #ifndef SURF_ROUTING_CLUSTER_HPP_
 #define SURF_ROUTING_CLUSTER_HPP_
 
+#include "surf_routing_none.hpp"
+#include "network_interface.hpp"
+
 /***********
  * Classes *
  ***********/

diff --git a/src/surf/surf_routing_cluster_fat_tree.hpp b/src/surf/surf_routing_cluster_fat_tree.hpp
index ae7e2c0..2180d06 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.hpp
+++ b/src/surf/surf_routing_cluster_fat_tree.hpp
@@ -4,11 +4,11 @@
 /* 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 "surf_routing_cluster.hpp"
-
 #ifndef SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
 #define SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
 
+#include "surf_routing_cluster.hpp"
+
 
 /** \file surf_routing_cluster_fat_tree.cpp
  *  The class AsClusterFatTree describes PGFT, as introduced by Eitan Zahavi

diff --git a/src/surf/surf_routing_cluster_torus.hpp b/src/surf/surf_routing_cluster_torus.hpp
index d324d52..bd1f9e7 100644 (file)
--- a/src/surf/surf_routing_cluster_torus.hpp
+++ b/src/surf/surf_routing_cluster_torus.hpp
@@ -4,14 +4,14 @@
 /* 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 "surf_routing_none.hpp"
-#include "network_interface.hpp"
-#include "surf_routing_cluster.hpp"
-
 
 #ifndef SURF_ROUTING_CLUSTER_TORUS_HPP_
 #define SURF_ROUTING_CLUSTER_TORUS_HPP_
 
+#include "surf_routing_none.hpp"
+#include "network_interface.hpp"
+#include "surf_routing_cluster.hpp"
+
 class AsClusterTorus: public AsCluster {
 public:
    AsClusterTorus();

diff --git a/src/surf/surf_routing_floyd.hpp b/src/surf/surf_routing_floyd.hpp
index 8cf9f28..ed39b19 100644 (file)
--- a/src/surf/surf_routing_floyd.hpp
+++ b/src/surf/surf_routing_floyd.hpp
@@ -4,11 +4,11 @@
 /* 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 "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_FLOYD_HPP_
 #define SURF_ROUTING_FLOYD_HPP_
 
+#include "surf_routing_generic.hpp"
 
 /***********
  * Classes *

diff --git a/src/surf/surf_routing_full.hpp b/src/surf/surf_routing_full.hpp
index 397f2ca..e4bc28d 100644 (file)
--- a/src/surf/surf_routing_full.hpp
+++ b/src/surf/surf_routing_full.hpp
@@ -4,11 +4,11 @@
 /* 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 "surf_routing_generic.hpp"
-
 #ifndef SURF_ROUTING_FULL_HPP_
 #define SURF_ROUTING_FULL_HPP_
 
+#include "surf_routing_generic.hpp"
+
 /***********
  * Classes *
  ***********/