X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FMEDFileEquivalence.hxx;h=a81a6f6613c78c224316516cffc0652c720e1190;hb=0deb03c833703262390b6c56ba068f4273261edf;hp=9c4eebd8d37c1a92d46cf85c79dd1c5102807123;hpb=79386ac5c73f8365c428b8ef595c4ef004959667;p=tools%2Fmedcoupling.git

diff --git a/src/MEDLoader/MEDFileEquivalence.hxx b/src/MEDLoader/MEDFileEquivalence.hxx
index 9c4eebd8d..a81a6f661 100644
--- a/src/MEDLoader/MEDFileEquivalence.hxx
+++ b/src/MEDLoader/MEDFileEquivalence.hxx
@@ -24,9 +24,11 @@
 #include "MEDLoaderDefines.hxx"
 #include "MEDCouplingRefCountObject.hxx"
 #include "MEDCouplingMemArray.hxx"
-#include "MEDFileUtilities.hxx"
+#include "MEDFileUtilities.txx"
 #include "MCAuto.hxx"
 
+#include "NormalizedGeometricTypes"
+
 #include <vector>
 
 namespace MEDCoupling
@@ -36,11 +38,11 @@ namespace MEDCoupling
   class MEDFileEquivalences;
   class MEDFileMesh;
 
-  class MEDFileEquivalencePair : public RefCountObject
+  class MEDFileEquivalencePair : public RefCountObject, public MEDFileWritableStandAlone
   {
   public:
     static MEDFileEquivalencePair *Load(MEDFileEquivalences *father, med_idt fid, const std::string& name, const std::string &desc);
-    void write(med_idt fid) const;
+    void writeLL(med_idt fid) const;
     const MEDFileEquivalences *getFather() const { return _father; }
     MEDFileEquivalences *getFather() { return _father; }
     const MEDFileMesh *getMesh() const;
@@ -72,7 +74,7 @@ namespace MEDCoupling
     MCAuto<MEDFileEquivalenceNode> _node;
   };
 
-  class MEDFileEquivalences : public RefCountObject
+  class MEDFileEquivalences : public RefCountObject, public MEDFileWritableStandAlone
   {
   public:
     MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
@@ -96,7 +98,7 @@ namespace MEDCoupling
     MEDLOADER_EXPORT void killEquivalenceAt(int i);
     MEDLOADER_EXPORT void clear();
   public:
-    void write(med_idt fid) const;
+    MEDLOADER_EXPORT void writeLL(med_idt fid) const;
     static int PresenceOfEquivalences(med_idt fid, const std::string& meshName);
     static MEDFileEquivalences *Load(med_idt fid, int nbOfEq, MEDFileMesh *owner);
     static void CheckDataArray(const DataArrayInt *data);
@@ -108,7 +110,7 @@ namespace MEDCoupling
     std::vector< MCAuto<MEDFileEquivalencePair> > _equ;
   };
 
-  class MEDFileEquivalenceBase : public RefCountObject
+  class MEDFileEquivalenceBase : public RefCountObject, public MEDFileWritableStandAlone
   {
   protected:
     MEDFileEquivalenceBase(MEDFileEquivalencePair *father);
@@ -132,7 +134,7 @@ namespace MEDCoupling
     MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
     bool isEqual(const MEDFileEquivalenceData *other, std::string& what) const;
   protected:
-    void writeLL(med_idt fid, med_entity_type medtype, med_geometry_type medgt) const;
+    void writeAdvanced(med_idt fid, med_entity_type medtype, med_geometry_type medgt) const;
   protected:
     ~MEDFileEquivalenceData() { }
   protected:
@@ -149,8 +151,8 @@ namespace MEDCoupling
     bool isEqual(const MEDFileEquivalenceCellType *other, std::string& what) const;
     void getRepr(std::ostream& oss) const;
   public:
-    void write(med_idt fid) const;
-  private:
+    void writeLL(med_idt fid) const;
+  protected:
     ~MEDFileEquivalenceCellType() { }
   private:
     INTERP_KERNEL::NormalizedCellType _type;
@@ -162,7 +164,7 @@ namespace MEDCoupling
     MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
     MEDLOADER_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const;
     static MEDFileEquivalenceCell *Load(med_idt fid, MEDFileEquivalencePair *owner);
-    void write(med_idt fid) const;
+    void writeLL(med_idt fid) const;
     MEDFileEquivalenceCell *deepCopy(MEDFileEquivalencePair *owner) const;
     bool isEqual(const MEDFileEquivalenceCell *other, std::string& what) const;
     void getRepr(std::ostream& oss) const;
@@ -189,11 +191,11 @@ namespace MEDCoupling
   public:
     MEDFileEquivalenceNode(MEDFileEquivalencePair *owner, DataArrayInt *data):MEDFileEquivalenceData(owner,data) { }
     MEDLOADER_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const;
-    void write(med_idt fid) const;
+    void writeLL(med_idt fid) const;
     MEDFileEquivalenceNode *deepCopy(MEDFileEquivalencePair *owner) const;
     bool isEqual(const MEDFileEquivalenceNode *other, std::string& what) const;
     void getRepr(std::ostream& oss) const;
-  private:
+  protected:
     ~MEDFileEquivalenceNode() { }
   };
 }