[s4u] Group fields at the end of the class

[simgrid.git] / include / simgrid / s4u / file.hpp

diff --git a/include/simgrid/s4u/file.hpp b/include/simgrid/s4u/file.hpp
index f2182a3..809bd78 100644 (file)
--- a/include/simgrid/s4u/file.hpp
+++ b/include/simgrid/s4u/file.hpp
@@ -6,7 +6,6 @@
 #ifndef SIMGRID_S4U_FILE_HPP
 #define SIMGRID_S4U_FILE_HPP
 
-#include <boost/unordered_map.hpp>
 #include <vector>
 
 #include <xbt/base.h>
@@ -29,33 +28,28 @@ XBT_PUBLIC_CLASS File {
 public:
   File(const char *fullpath, void* userdata);
   ~File();
-private:
-  smx_file_t p_inferior;
-  const char *p_path;
 
-public:
   /** Retrieves the path to the file */
-  const char *path() { return p_path;}
-public:
+  const char *path() { return path_;}
+
   /** Simulates a read action. Returns the size of data actually read
    *
-   *  FIXME: reading from a remotely mounted disk is not implemented yet. Any storage is considered as local, and no network communication ever occur.
+   *  FIXME: reading from a remotely mounted disk is not implemented yet.
+   *  Any storage is considered as local, and no network communication ever occur.
    */
   sg_size_t read(sg_size_t size);
   /** Simulates a write action. Returns the size of data actually written.
    *
-   *  FIXME: reading from a remotely mounted disk is not implemented yet. Any storage is considered as local, and no network communication ever occur.
+   *  FIXME: reading from a remotely mounted disk is not implemented yet.
+   *  Any storage is considered as local, and no network communication ever occur.
    */
   sg_size_t write(sg_size_t size);
 
   /** Allows to store user data on that host */
-  void set_userdata(void *data) {p_userdata = data;}
+  void setUserdata(void *data) {userdata_ = data;}
   /** Retrieves the previously stored data */
-  void* userdata() {return p_userdata;}
-private:
-  void *p_userdata=NULL;
+  void* userdata() {return userdata_;}
 
-public:
   /** Retrieve the datasize */
   sg_size_t size();
 
@@ -78,6 +72,10 @@ public:
   XBT_PUBLIC(msg_error_t) MSG_file_rmove(msg_file_t fd, msg_host_t host, const char* fullpath);
   */
 
+private:
+  smx_file_t pimpl_ = nullptr;
+  const char *path_ = nullptr;
+  void *userdata_ = nullptr;
 };
 
 }} // namespace simgrid::s4u