Merge pull request #1 from mquinson/master

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

diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp
index 7328b97..553f941 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
@@ -7,15 +7,20 @@
 #ifndef SURF_NETWORK_IB_HPP_
 #define SURF_NETWORK_IB_HPP_
 
+#include <xbt/base.h>
+
 #include "network_smpi.hpp"
-class IBNode;
 
+namespace simgrid {
+namespace surf {
+
+class XBT_PRIVATE IBNode;
 
-class ActiveComm{
+class XBT_PRIVATE ActiveComm{
 public :
   //IBNode* origin;
   IBNode* destination;
-  NetworkActionPtr action;
+  NetworkAction *action;
   double init_rate;
   ActiveComm() : destination(NULL),action(NULL),init_rate(-1){};
   ~ActiveComm(){};
@@ -34,7 +39,7 @@ public :
   ~IBNode(){};
 };
 
-class NetworkIBModel : public NetworkSmpiModel {
+class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
 private:
   void updateIBfactors_rec(IBNode *root, bool* updatedlist);
   void computeIBfactors(IBNode *root);
@@ -42,10 +47,10 @@ 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;
@@ -53,4 +58,7 @@ public:
 
 };
 
+}
+}
+
 #endif