Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SWIG exception: removing C++11 warnings, minimal work.
[tools/medcoupling.git]
/
src
/
MEDLoader
/
MEDFileEquivalence.cxx
diff --git
a/src/MEDLoader/MEDFileEquivalence.cxx
b/src/MEDLoader/MEDFileEquivalence.cxx
index 22e193291055736924839d08435b20c5c5d3f518..10fe80b8666c9373263cb44fe9c9a2690f52f07f 100644
(file)
--- a/
src/MEDLoader/MEDFileEquivalence.cxx
+++ b/
src/MEDLoader/MEDFileEquivalence.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D
+// Copyright (C) 2007-201
9
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-41,7
+41,7
@@
MEDFileEquivalencePair *MEDFileEquivalencePair::Load(MEDFileEquivalences *father
return ret.retn();
}
return ret.retn();
}
-void MEDFileEquivalencePair::write(med_idt fid) const
+void MEDFileEquivalencePair::write
LL
(med_idt fid) const
{
std::string meshName(getFather()->getMeshName());
INTERP_KERNEL::AutoPtr<char> meshName2(MEDLoaderBase::buildEmptyString(MED_NAME_SIZE));
{
std::string meshName(getFather()->getMeshName());
INTERP_KERNEL::AutoPtr<char> meshName2(MEDLoaderBase::buildEmptyString(MED_NAME_SIZE));
@@
-53,10
+53,10
@@
void MEDFileEquivalencePair::write(med_idt fid) const
MEDFILESAFECALLERWR0(MEDequivalenceCr,(fid,meshName2,name,desc));
const MEDFileEquivalenceCell *cell(_cell);
if(cell)
MEDFILESAFECALLERWR0(MEDequivalenceCr,(fid,meshName2,name,desc));
const MEDFileEquivalenceCell *cell(_cell);
if(cell)
- cell->write(fid);
+ cell->write
LL
(fid);
const MEDFileEquivalenceNode *node(_node);
if(node)
const MEDFileEquivalenceNode *node(_node);
if(node)
- node->write(fid);
+ node->write
LL
(fid);
}
const MEDFileMesh *MEDFileEquivalencePair::getMesh() const
}
const MEDFileMesh *MEDFileEquivalencePair::getMesh() const
@@
-392,13
+392,13
@@
void MEDFileEquivalences::clear()
_equ.clear();
}
_equ.clear();
}
-void MEDFileEquivalences::write(med_idt fid) const
+void MEDFileEquivalences::write
LL
(med_idt fid) const
{
for(std::vector< MCAuto<MEDFileEquivalencePair> >::const_iterator it=_equ.begin();it!=_equ.end();it++)
{
const MEDFileEquivalencePair *elt(*it);
if(elt)
{
for(std::vector< MCAuto<MEDFileEquivalencePair> >::const_iterator it=_equ.begin();it!=_equ.end();it++)
{
const MEDFileEquivalencePair *elt(*it);
if(elt)
- elt->write(fid);
+ elt->write
LL
(fid);
}
}
}
}
@@
-494,7
+494,7
@@
bool MEDFileEquivalenceData::isEqual(const MEDFileEquivalenceData *other, std::s
return true;
}
return true;
}
-void MEDFileEquivalenceData::write
LL
(med_idt fid, med_entity_type medtype, med_geometry_type medgt) const
+void MEDFileEquivalenceData::write
Advanced
(med_idt fid, med_entity_type medtype, med_geometry_type medgt) const
{
const DataArrayInt *da(getArray());
{
const DataArrayInt *da(getArray());
@@
-549,9
+549,9
@@
void MEDFileEquivalenceCellType::getRepr(std::ostream& oss) const
oss << ",";
}
oss << ",";
}
-void MEDFileEquivalenceCellType::write(med_idt fid) const
+void MEDFileEquivalenceCellType::write
LL
(med_idt fid) const
{
{
- write
LL
(fid,MED_CELL,typmai3[_type]);
+ write
Advanced
(fid,MED_CELL,typmai3[_type]);
}
std::vector<const BigMemoryObject *> MEDFileEquivalenceCell::getDirectChildrenWithNull() const
}
std::vector<const BigMemoryObject *> MEDFileEquivalenceCell::getDirectChildrenWithNull() const
@@
-578,13
+578,13
@@
MEDFileEquivalenceCell *MEDFileEquivalenceCell::Load(med_idt fid, MEDFileEquival
return 0;
}
return 0;
}
-void MEDFileEquivalenceCell::write(med_idt fid) const
+void MEDFileEquivalenceCell::write
LL
(med_idt fid) const
{
for(std::vector< MCAuto<MEDFileEquivalenceCellType> >::const_iterator it=_types.begin();it!=_types.end();it++)
{
const MEDFileEquivalenceCellType *ct(*it);
if(ct)
{
for(std::vector< MCAuto<MEDFileEquivalenceCellType> >::const_iterator it=_types.begin();it!=_types.end();it++)
{
const MEDFileEquivalenceCellType *ct(*it);
if(ct)
- ct->write(fid);
+ ct->write
LL
(fid);
}
}
}
}
@@
-741,9
+741,9
@@
std::size_t MEDFileEquivalenceNode::getHeapMemorySizeWithoutChildren() const
return sizeof(MEDFileEquivalenceNode);
}
return sizeof(MEDFileEquivalenceNode);
}
-void MEDFileEquivalenceNode::write(med_idt fid) const
+void MEDFileEquivalenceNode::write
LL
(med_idt fid) const
{
{
- write
LL
(fid,MED_NODE,MED_NONE);
+ write
Advanced
(fid,MED_NODE,MED_NONE);
}
MEDFileEquivalenceNode *MEDFileEquivalenceNode::deepCopy(MEDFileEquivalencePair *owner) const
}
MEDFileEquivalenceNode *MEDFileEquivalenceNode::deepCopy(MEDFileEquivalencePair *owner) const