Reduce the amount of (protected) multiple includes

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

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index 46ac808..5b8d25d 100644 (file)
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -13,13 +13,7 @@
  * Classes *
  ***********/
 class NetworkConstantModel;
-typedef NetworkConstantModel *NetworkConstantModelPtr;
-
-class NetworkConstantLink;
-typedef NetworkConstantLink *NetworkConstantLinkPtr;
-
 class NetworkConstantAction;
-typedef NetworkConstantAction *NetworkConstantActionPtr;
 
 /*********
  * Model *
@@ -27,16 +21,14 @@ typedef NetworkConstantAction *NetworkConstantActionPtr;
 class NetworkConstantModel : public NetworkCm02Model {
 public:
   NetworkConstantModel()
-  : NetworkCm02Model("constant time network")
+  : NetworkCm02Model()
   {
     p_updateMechanism = UM_UNDEFINED;
   };
   double shareResources(double now);
   void updateActionsState(double now, double delta);
-  ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
-                                          double size, double rate);
-  void gapRemove(ActionPtr action);
-  //FIXME:virtual void addTraces() =0;
+  Action *communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate);
+  void gapRemove(Action *action);
 };
 
 /************
@@ -44,7 +36,7 @@ public:
  ************/
 class NetworkConstantLink : public NetworkCm02Link {
 public:
-  NetworkConstantLink(NetworkCm02ModelPtr model, const char* name, xbt_dict_t properties);
+  NetworkConstantLink(NetworkCm02Model *model, const char* name, xbt_dict_t properties);
   bool isUsed();
   void updateState(tmgr_trace_event_t event_type, double value, double date);
   double getBandwidth();
@@ -57,7 +49,7 @@ public:
  **********/
 class NetworkConstantAction : public NetworkCm02Action {
 public:
-  NetworkConstantAction(NetworkConstantModelPtr model_, double size, double latency)
+  NetworkConstantAction(NetworkConstantModel *model_, double size, double latency)
   : NetworkCm02Action(model_, size, false)
   , m_latInit(latency)
   {
@@ -69,7 +61,6 @@ public:
        p_variable = NULL;
   };
   int unref();
-  void recycle();
   void cancel();
   void setCategory(const char *category);
   void suspend();