X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingMatrix.hxx;h=221e67b3e32a6d9ec6b35f4c88fcc29306212754;hb=a6c4fa941f2f989606ab1ccf0d89c5992a0193a9;hp=f0e86287c1c79188cc5bcd2ee874565a415595c8;hpb=75943f980f7b908052ef03c2c0154508f4b0a039;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingMatrix.hxx b/src/MEDCoupling/MEDCouplingMatrix.hxx index f0e86287c..221e67b3e 100644 --- a/src/MEDCoupling/MEDCouplingMatrix.hxx +++ b/src/MEDCoupling/MEDCouplingMatrix.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 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 @@ -25,11 +25,11 @@ #include "MEDCouplingTimeLabel.hxx" #include "MEDCouplingRefCountObject.hxx" #include "MEDCouplingMemArray.hxx" -#include "MEDCouplingAutoRefCountObjectPtr.hxx" +#include "MCAuto.hxx" #include "InterpKernelException.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { /*! * The aim of this class is \b NOT to reimplement all linear algebra but only to store a dense matrix. @@ -40,7 +40,7 @@ namespace ParaMEDMEM public: MEDCOUPLING_EXPORT static DenseMatrix *New(int nbRows, int nbCols); MEDCOUPLING_EXPORT static DenseMatrix *New(DataArrayDouble *array, int nbRows, int nbCols); - MEDCOUPLING_EXPORT DenseMatrix *deepCpy() const; + MEDCOUPLING_EXPORT DenseMatrix *deepCopy() const; MEDCOUPLING_EXPORT DenseMatrix *shallowCpy() const; MEDCOUPLING_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const; MEDCOUPLING_EXPORT std::vector getDirectChildrenWithNull() const; @@ -79,7 +79,7 @@ namespace ParaMEDMEM private: int _nb_rows; int _nb_cols; - MEDCouplingAutoRefCountObjectPtr _data; + MCAuto _data; }; }