Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/medcoupling

[tools/medcoupling.git] / src / MEDCoupling / MCAuto.hxx

diff --git a/src/MEDCoupling/MCAuto.hxx b/src/MEDCoupling/MCAuto.hxx
index 6614cbfdfaa383eba763f4710628c5a8ab019eea..76e00de3818303de1cce074041a9e68fbebc7721 100644 (file)
--- a/src/MEDCoupling/MCAuto.hxx
+++ b/src/MEDCoupling/MCAuto.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020  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
@@ -18,12 +18,13 @@
 //
 // Author : Anthony Geay (CEA/DEN)
 
-#ifndef __PARAMEDMEM_MEDCOUPLINGAUTOREFCOUNTOBJECTPTR_HXX__
-#define __PARAMEDMEM_MEDCOUPLINGAUTOREFCOUNTOBJECTPTR_HXX__
+#pragma once
 
 #include "MEDCouplingRefCountObject.hxx"
 #include "InterpKernelException.hxx"
 
+#include <vector>
+
 namespace MEDCoupling
 {
   template<class T>
@@ -33,6 +34,7 @@ namespace MEDCoupling
     MCAuto(const MCAuto& other):_ptr(0) { referPtr(other._ptr); }
     MCAuto(T *ptr=0):_ptr(ptr) { }
     ~MCAuto() { destroyPtr(); }
+    void checkNotNull() const { if(!_ptr) throw INTERP_KERNEL::Exception("Pointer is nullptr !"); }
     bool isNull() const { return _ptr==0; }
     bool isNotNull() const { return !isNull(); }
     void nullify() { destroyPtr(); _ptr=0; }
@@ -48,6 +50,7 @@ namespace MEDCoupling
     operator T *() { return _ptr; }
     operator const T *() const { return _ptr; }
     T *retn() { if(_ptr) _ptr->incrRef(); return _ptr; }
+    T *retnConstCast() const { if(_ptr) _ptr->incrRef(); return _ptr; }
     T *iAmATrollConstCast() const { return _ptr; }
   private:
     void referPtr(T *ptr) { _ptr=ptr; if(_ptr) _ptr->incrRef(); }
@@ -80,11 +83,22 @@ namespace MEDCoupling
     return ret;
   }
 
+  template<class T>
+  typename std::vector<const T *> ToConstVect(const typename std::vector< MCAuto<T> >& vec)
+  {
+    std::size_t sz(vec.size());
+    std::vector<const T *> ret(sz);
+    for(std::size_t i=0;i<sz;i++)
+      ret[i]=(const T *)vec[i];
+    return ret;
+  }
+  
   template<class T>
   class MCConstAuto
   {
   public:
     MCConstAuto(const MCConstAuto& other):_ptr(0) { referPtr(other._ptr); }
+    MCConstAuto(const typename MEDCoupling::MCAuto<T> & other):_ptr(0) { referPtr( (const T*) other); }
     MCConstAuto(const T *ptr=0):_ptr(ptr) { }
     ~MCConstAuto() { destroyPtr(); }
     bool isNull() const { return _ptr==0; }
@@ -100,12 +114,11 @@ namespace MEDCoupling
     const T& operator*() { return *_ptr; }
     const T& operator*() const { return *_ptr; }
     operator const T *() const { return _ptr; }
+    T *shameOnMeConstCast() const { return const_cast<T*>(_ptr); }
   private:
-    void referPtr(T *ptr) { _ptr=ptr; if(_ptr) _ptr->incrRef(); }
+    void referPtr(const T *ptr) { _ptr=ptr; if(_ptr) _ptr->incrRef(); }
     void destroyPtr() { if(_ptr) _ptr->decrRef(); }
   private:
     const T *_ptr;
   };
 }
-
-#endif