[arcane,std] N'utilise plus 'TextWriter2' et 'TextReader2' dans 'BasicGenericReader' et 'BasicGenericWriter'.

Author: grospelliergilles

arcane/src/arcane/std/BasicGenericReader.cc

@@ -27,8 +27,6 @@
 #include "arcane/core/ISerializedData.h"
 #include "arcane/core/XmlNodeList.h"
 
-#include "arcane/std/internal/TextReader2.h"
-
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
@@ -230,24 +228,25 @@ readItemGroup(const String& group_full_name, Int64Array& written_unique_ids,
     }
     return;
   }
+
   info(5) << "READ GROUP " << group_full_name;
   String filename = BasicReaderWriterCommon::_getBasicGroupFile(m_path, group_full_name, m_rank);
-  TextReader2 reader(filename);
+  std::ifstream reader(filename.localstr(), std::ios::in | std::ios::binary);
 
   {
     Integer nb_unique_id = 0;
-    reader.readIntegers(IntegerArrayView(1, &nb_unique_id));
+    binaryRead(reader,asWritableBytes(SmallSpan<Integer>(&nb_unique_id, 1)));
     info(5) << "NB_WRITTEN_UNIQUE_ID = " << nb_unique_id;
     written_unique_ids.resize(nb_unique_id);
-    reader.read(asWritableBytes(written_unique_ids.span()));
+    binaryRead(reader,asWritableBytes(written_unique_ids.span()));
   }
 
   {
     Integer nb_unique_id = 0;
-    reader.readIntegers(IntegerArrayView(1, &nb_unique_id));
+    binaryRead(reader,asWritableBytes(SmallSpan<Integer>(&nb_unique_id, 1)));
     info(5) << "NB_WANTED_UNIQUE_ID = " << nb_unique_id;
     wanted_unique_ids.resize(nb_unique_id);
-    reader.read(asWritableBytes(wanted_unique_ids.span()));
+    binaryRead(reader,asWritableBytes(wanted_unique_ids.span()));
   }
 }
 

arcane/src/arcane/std/BasicGenericWriter.cc

@@ -25,8 +25,6 @@
 #include "arcane/core/ISerializedData.h"
 #include "arcane/core/IRessourceMng.h"
 
-#include "arcane/std/internal/TextWriter2.h"
-
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
@@ -119,20 +117,20 @@ writeItemGroup(const String& group_full_name, SmallSpan<const Int64> written_uni
   }
 
   String filename = BasicReaderWriterCommon::_getBasicGroupFile(m_path, group_full_name, m_rank);
-  TextWriter2 writer(filename);
+  ofstream writer(filename.localstr(),std::ios::out | std::ios::binary);
 
   // Sauve la liste des unique_ids écrits
   {
     Integer nb_unique_id = written_unique_ids.size();
-    writer.write(asBytes(Span<const Int32>(&nb_unique_id, 1)));
-    writer.write(asBytes(written_unique_ids));
+    binaryWrite(writer,asBytes(Span<const Int32>(&nb_unique_id, 1)));
+    binaryWrite(writer,asBytes(written_unique_ids));
   }
 
   // Sauve la liste des unique_ids souhaités par ce sous-domaine
   {
     Integer nb_unique_id = wanted_unique_ids.size();
-    writer.write(asBytes(Span<const Int32>(&nb_unique_id, 1)));
-    writer.write(asBytes(wanted_unique_ids));
+    binaryWrite(writer,asBytes(Span<const Int32>(&nb_unique_id, 1)));
+    binaryWrite(writer,asBytes(wanted_unique_ids));
   }
 }