X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRefCounter.h;h=3ba30e23a00536c8bde2d166bb9e073782eea760;hb=721d134c6e594b9a23bf1ce002ed87bfbc1576a7;hp=cb3471a936e1ed6bc331dbc90f78eb0feaf837e0;hpb=6a7c2fbcb5bfc240a3b9875ad4836f5dc058e069;p=gdcm.git

diff --git a/src/gdcmRefCounter.h b/src/gdcmRefCounter.h
index cb3471a9..3ba30e23 100644
--- a/src/gdcmRefCounter.h
+++ b/src/gdcmRefCounter.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRefCounter.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/20 15:24:10 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2007/10/04 17:50:42 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,13 +16,14 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMREFCOUNTER_H
-#define GDCMREFCOUNTER_H
+#ifndef _GDCMREFCOUNTER_H_
+#define _GDCMREFCOUNTER_H_
 
 #include "gdcmBase.h"
-#include "gdcmDebug.h"
+//#include "gdcmDebug.h"
+#include <typeinfo>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 /**
@@ -31,45 +32,38 @@ namespace gdcm
  */
 class GDCM_EXPORT RefCounter : public Base
 {
-public:
    gdcmTypeMacro(RefCounter);
 
 public:
 // Allocator / Unallocator
-   /// Delete the object
+   /// \brief Delete the object
    /// \remarks The object is deleted only if its reference counting is to zero
-   inline virtual void Delete(void)
-   {
-      Unregister();
-   }
+   void Delete() { Unregister(); }
 
 // Reference count
-   /// Register the object
+   /// \brief Register the object
    /// \remarks It increments the reference counting
-   inline void Register(void)
-   {
-      RefCount++;
-   }
-   /// Unregister the object
+   void Register() { RefCount++; }
+
+   /// \brief Unregister the object
    /// \remarks It decrements the reference counting
-   inline void Unregister(void)
+   void Unregister()
    {
+//std::cout <<"================Unreg " << typeid(*this).name() << std::endl;
       RefCount--;
-      if(RefCount==0)
-      {
-         delete this;
-      }
+      if(RefCount<=0)
+        delete this;
    }
-   /// Get the reference counting
+   /// \brief Get the reference counting
    /// \return Reference count
-   inline const unsigned long &GetRefCount(void) const
+   const unsigned long &GetRefCount() const
    {
-      return(RefCount);
+      return RefCount;
    }
 
 protected:
    /// Constructor
-   RefCounter() { RefCount = 1; }
+   RefCounter() : RefCount(1) { }
    /// Destructor
    virtual ~RefCounter() {}