From f96adac6fea067e22ef7d234e49638b0555cce14 Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Wed, 10 Sep 2014 16:15:03 +0000 Subject: [PATCH] autoptr and parallel --- libsrc/general/autoptr.hpp | 3 ++- libsrc/meshing/meshtype.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libsrc/general/autoptr.hpp b/libsrc/general/autoptr.hpp index 352a6105..3de595ad 100644 --- a/libsrc/general/autoptr.hpp +++ b/libsrc/general/autoptr.hpp @@ -10,6 +10,7 @@ namespace netgen { + /* template class AutoPtr { @@ -30,7 +31,7 @@ private: AutoPtr (AutoPtr &) { ; } AutoPtr & operator= (AutoPtr &) { ; } }; - + */ } #endif diff --git a/libsrc/meshing/meshtype.cpp b/libsrc/meshing/meshtype.cpp index 9687290a..72befa71 100644 --- a/libsrc/meshing/meshtype.cpp +++ b/libsrc/meshing/meshtype.cpp @@ -1645,8 +1645,8 @@ namespace netgen - Array< AutoPtr < IntegrationPointData > > ipdtet; - Array< AutoPtr < IntegrationPointData > > ipdtet10; + Array< shared_ptr < IntegrationPointData > > ipdtet; + Array< shared_ptr < IntegrationPointData > > ipdtet10; @@ -2235,8 +2235,8 @@ namespace netgen switch (GetType()) { - case TET: ipdtet.Elem(i).Reset(ipd); break; - case TET10: ipdtet10.Elem(i).Reset(ipd); break; + case TET: ipdtet.Elem(i).reset(ipd); break; + case TET10: ipdtet10.Elem(i).reset(ipd); break; default: PrintSysError ("Element::ComputeIntegrationPoint(2), illegal type ", int(typ)); }