Import Geant4 10.4.0 source tree

source/analysis/g4tools/include/tools/rroot/file

@@ -17,8 +17,6 @@
 #ifdef _MSC_VER
 #include <io.h>
 #include <sys/stat.h>
-// disable the warning about the usage of "this" in the constructor.
-#pragma warning(disable:4355)
 #else
 #include <unistd.h>
 #endif
@@ -27,6 +25,7 @@ namespace tools {
 namespace rroot {
 
 class file : public virtual ifile {
+  file& get_me() {return *this;} //_MSC_VER : to avoid warning about the usage of "this" in the constructor.
   static int not_open() {return -1;}
 public:
   static const std::string& s_class() {
@@ -115,7 +114,7 @@ public:
   ,m_verbose(a_verbose)
   ,m_file(not_open())
   ,m_bytes_read(0)
-  ,m_root_directory(*this)
+  ,m_root_directory(get_me())
   ,m_streamer_info_key(a_out)
   // begin of record :
   ,m_version(0)
@@ -156,7 +155,7 @@ protected:
   file(const file& a_from)
   :ifile(a_from)
   ,m_out(a_from.m_out)
-  ,m_root_directory(*this)
+  ,m_root_directory(get_me())
   ,m_streamer_info_key(a_from.m_out)
   { 
 #ifdef TOOLS_MEM
@@ -445,7 +444,7 @@ protected:
   std::string m_path;
   bool m_verbose;
   int m_file;
-  tools::uint64 m_bytes_read; //Number of bytes read from this file
+  uint64 m_bytes_read; //Number of bytes read from this file
   directory m_root_directory;
   key m_streamer_info_key;
   std::map<char,decompress_func> m_unzipers;