Replace NULL with nullptr.

[loba.git] / hostdata.h

diff --git a/hostdata.h b/hostdata.h
index 703b7a1b38410f158912ea1a22993c31759c26e8..2c5379a37540831bbdc8fc7a6cce391f0238267b 100644 (file)
--- a/hostdata.h
+++ b/hostdata.h
@@ -3,7 +3,8 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <msg/msg.h>
+#include <simgrid/msg.h>
+#include "simgrid_features.h"

 
 // Helper class that associates instances of itself with each host.
 // Facilitate global operations on hosts, and retreiving of host name
 
 // Helper class that associates instances of itself with each host.
 // Facilitate global operations on hosts, and retreiving of host name


@@ -15,7 +16,7 @@ public:
     static size_t size()                        { return hosts.size(); }
     static const hostdata& at(size_t i)         { return hosts[i];     }
 
     static size_t size()                        { return hosts.size(); }
     static const hostdata& at(size_t i)         { return hosts[i];     }
 

-    hostdata(m_host_t host);
+    hostdata(msg_host_t host);

     ~hostdata();
 
     const char* get_name() const                { return name;              }
     ~hostdata();
 
     const char* get_name() const                { return name;              }


@@ -25,7 +26,6 @@ public:
 private:
     // static list of hostdata's, used by create/destroy
     static std::vector<hostdata> hosts;
 private:
     // static list of hostdata's, used by create/destroy
     static std::vector<hostdata> hosts;

-    struct m_host_less;

 
     const char* name;
     std::string ctrl_mbox;
 
     const char* name;
     std::string ctrl_mbox;