X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingMultiFields.cxx;h=d7d4e9b899bb8a0c0f81db8f554a53e24be5465e;hb=fb6ad3f990cf8c26e23ff4f6ed571d85dc738aac;hp=35bea1a29ecbf6754e0cf5037b641aae532b8b17;hpb=aa60c5c907c78293330a22ecee21476f72a9ec34;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingMultiFields.cxx b/src/MEDCoupling/MEDCouplingMultiFields.cxx index 35bea1a29..d7d4e9b89 100644 --- a/src/MEDCoupling/MEDCouplingMultiFields.cxx +++ b/src/MEDCoupling/MEDCouplingMultiFields.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D +// Copyright (C) 2007-2015 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 @@ -27,7 +27,7 @@ #include #include -using namespace ParaMEDMEM; +using namespace MEDCoupling; MEDCouplingMultiFields *MEDCouplingMultiFields::New(const std::vector& fs) { @@ -195,15 +195,11 @@ std::size_t MEDCouplingMultiFields::getHeapMemorySizeWithoutChildren() const return 0; } -std::vector MEDCouplingMultiFields::getDirectChildren() const +std::vector MEDCouplingMultiFields::getDirectChildrenWithNull() const { std::vector ret; for(std::vector< MEDCouplingAutoRefCountObjectPtr >::const_iterator it=_fs.begin();it!=_fs.end();it++) - { - const MEDCouplingFieldDouble *curF(*it); - if(curF) - ret.push_back(curF); - } + ret.push_back((const MEDCouplingFieldDouble *)*it); return ret; }