kill dead code

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

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 9858267..bca2f83 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -1,20 +1,23 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. 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. */
 
+#ifndef SURF_NETWORK_INTERFACE_HPP_
+#define SURF_NETWORK_INTERFACE_HPP_
+
+#include <xbt/base.h>
+
 #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 *
  ***********/
@@ -72,12 +75,9 @@ XBT_PUBLIC(void) net_add_traces();
 class NetworkModel : public Model {
 public:
   /** @brief Constructor */
-  NetworkModel() : Model("network") { }
-
-  /** @brief Constructor */
-  NetworkModel(const char *name) : Model(name) { }
+  NetworkModel() : Model() { }
 
-  /** @brief The destructor of the NetworkModel */
+  /** @brief Destructor */
   ~NetworkModel() {
        if (p_maxminSystem)
          lmm_system_free(p_maxminSystem);
@@ -111,7 +111,7 @@ public:
                                    e_surf_link_sharing_policy_t policy,
                                    xbt_dict_t properties)=0;
 
-  virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction */*action*/) {};
+  virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
 
   /**
    * @brief Create a communication between two hosts.
@@ -267,8 +267,7 @@ public:
  */
 class NetworkAction : public Action {
 public:
-  /**
-   * @brief NetworkAction constructor
+  /** @brief Constructor
    *
    * @param model The NetworkModel associated to this NetworkAction
    * @param cost The cost of this  NetworkAction in [TODO]