Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / s4u / s4u_file.cpp

diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp
index 23a6360..2f61275 100644 (file)
--- a/src/s4u/s4u_file.cpp
+++ b/src/s4u/s4u_file.cpp
@@ -5,7 +5,6 @@
 
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"
-#include "src/msg/msg_mailbox.h"
 
 #include "simgrid/s4u/actor.hpp"
 #include "simgrid/s4u/comm.hpp"
@@ -23,36 +22,36 @@ namespace s4u {
 
 File::File(const char*fullpath, void *userdata) {
   // this cannot fail because we get a xbt_die if the mountpoint does not exist
-  p_inferior = simcall_file_open(fullpath, Host::current());
-  p_path = fullpath;
+  pimpl_ = simcall_file_open(fullpath, Host::current());
+  path_ = fullpath;
 }
 
 File::~File() {
-  simcall_file_close(p_inferior, Host::current());
+  simcall_file_close(pimpl_, Host::current());
 }
 
 sg_size_t File::read(sg_size_t size) {
-  return simcall_file_read(p_inferior, size, Host::current());
+  return simcall_file_read(pimpl_, size, Host::current());
 }
 sg_size_t File::write(sg_size_t size) {
-  return simcall_file_write(p_inferior,size, Host::current());
+  return simcall_file_write(pimpl_,size, Host::current());
 }
 sg_size_t File::size() {
-  return simcall_file_get_size(p_inferior);
+  return simcall_file_get_size(pimpl_);
 }
 
 void File::seek(sg_size_t pos) {
-  simcall_file_seek(p_inferior,pos,SEEK_SET);
+  simcall_file_seek(pimpl_,pos,SEEK_SET);
 }
 sg_size_t File::tell() {
-  return simcall_file_tell(p_inferior);
+  return simcall_file_tell(pimpl_);
 }
 void File::move(const char*fullpath) {
-  simcall_file_move(p_inferior,fullpath);
+  simcall_file_move(pimpl_,fullpath);
 }
 void File::unlink() {
   sg_host_t attached = Host::current(); // FIXME: we should check where this file is attached
-  simcall_file_unlink(p_inferior,attached);
+  simcall_file_unlink(pimpl_,attached);
 }
 
 }} // namespace simgrid::s4u