From: geay Date: Thu, 12 Jun 2014 13:19:04 +0000 (+0200) Subject: For compatibility with 7.4.0. X-Git-Tag: V7_5_0a1~37^2~3^2~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d822b28d480469810d8cf014b962b9dc0a52369e;p=modules%2Fmed.git For compatibility with 7.4.0. --- diff --git a/src/ParaMEDMEM/TrioDEC.cxx b/src/ParaMEDMEM/TrioDEC.cxx index 9ae1734f5..6c9451c87 100644 --- a/src/ParaMEDMEM/TrioDEC.cxx +++ b/src/ParaMEDMEM/TrioDEC.cxx @@ -10,15 +10,15 @@ using namespace ParaMEDMEM; using namespace ICoCo; -TrioDEC::TrioDEC():_traduced_field(0) +TrioDEC::TrioDEC():_my_traduced_field(0) { } -TrioDEC::TrioDEC(ProcessorGroup& source_group, ProcessorGroup& target_group):InterpKernelDEC(source_group,target_group),_traduced_field(0) +TrioDEC::TrioDEC(ProcessorGroup& source_group, ProcessorGroup& target_group):InterpKernelDEC(source_group,target_group),_my_traduced_field(0) { } -TrioDEC::TrioDEC(const std::set& src_ids, const std::set& trg_ids, const MPI_Comm& world_comm):InterpKernelDEC(src_ids,trg_ids,world_comm),_traduced_field(0) +TrioDEC::TrioDEC(const std::set& src_ids, const std::set& trg_ids, const MPI_Comm& world_comm):InterpKernelDEC(src_ids,trg_ids,world_comm),_my_traduced_field(0) { } @@ -27,15 +27,15 @@ void TrioDEC::attachLocalField(ICoCo::TrioField *field) if(!field) throw INTERP_KERNEL::Exception("TrioDEC::attachLocalField : The input trio Field is NULL !"); releaseInternalPointer(); - _traduced_field=field->build_medfield(); - DisjointDEC::attachLocalField(_traduced_field); + _my_traduced_field=field->build_medfield(); + DisjointDEC::attachLocalField(_my_traduced_field); } void TrioDEC::releaseInternalPointer() { - if(_traduced_field) - delete _traduced_field; - _traduced_field=0; + if(_my_traduced_field) + delete _my_traduced_field; + _my_traduced_field=0; } TrioDEC::~TrioDEC() diff --git a/src/ParaMEDMEM/TrioDEC.hxx b/src/ParaMEDMEM/TrioDEC.hxx index 4f8fc315d..711bfe661 100644 --- a/src/ParaMEDMEM/TrioDEC.hxx +++ b/src/ParaMEDMEM/TrioDEC.hxx @@ -26,7 +26,7 @@ namespace ParaMEDMEM private: void releaseInternalPointer(); private : - ICoCo::MEDField *_traduced_field; + ICoCo::MEDField *_my_traduced_field; }; }