[travis] detect linux as we should

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

diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp
index 8adaf4a..4c39884 100644 (file)
--- a/src/surf/network_ib.hpp
+++ b/src/surf/network_ib.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -15,7 +15,7 @@ class ActiveComm{
 public :
   //IBNode* origin;
   IBNode* destination;
-  NetworkActionPtr action;
+  NetworkAction *action;
   double init_rate;
   ActiveComm() : destination(NULL),action(NULL),init_rate(-1){};
   ~ActiveComm(){};
@@ -42,10 +42,14 @@ public:
   NetworkIBModel();
   NetworkIBModel(const char *name);
   ~NetworkIBModel();
-  void updateIBfactors(NetworkActionPtr action, IBNode *from, IBNode * to, int remove);
+  void updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove);
   
   xbt_dict_t active_nodes;
-  std::map<NetworkActionPtr , std::pair<IBNode*,IBNode*> > active_comms;
+  std::map<NetworkAction *, std::pair<IBNode*,IBNode*> > active_comms;
+  
+  double Bs;
+  double Be;
+  double ys;
 
 };