From: malaterre <malaterre>
Date: Fri, 24 Sep 2004 03:34:27 +0000 (+0000)
Subject: FIX: Revert back to previous version, I don't believe this was a really safe code... 
X-Git-Tag: Version0.6.bp~164
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0328b825e66dd367845c51cb7aaf0e1d94607bdb;p=gdcm.git

FIX: Revert back to previous version, I don't believe this was a really safe code anyway. Plus this solve my issue on the Mac using gcc version 3.3 20030304 (Apple Computer, Inc. build 1666). The code should also more readable.
---

diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx
index 2891b21c..baa6a433 100644
--- a/src/gdcmDebug.cxx
+++ b/src/gdcmDebug.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/31 14:24:47 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2004/09/24 03:34:27 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,9 +19,6 @@
 #include <iostream>
 #include "gdcmDebug.h"
 
-//-----------------------------------------------------------------------------
-gdcmDebug gdcmDebug::debug;
-
 //-----------------------------------------------------------------------------
 /**
  * \brief   constructor
@@ -118,13 +115,3 @@ void gdcmDebug::Exit(int a)
    exit(a);    // Found in #include <stdlib.h>
 #endif
 }
-
-/**
- * \brief  Get the debug instance 
- * \return Reference to the debug instance
- */
-gdcmDebug &gdcmDebug::GetReference()
-{
-   return gdcmDebug::debug;
-}
-
diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index ae3e013f..3489a873 100644
--- a/src/gdcmDebug.h
+++ b/src/gdcmDebug.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.h,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 02:39:09 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2004/09/24 03:34:27 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,9 +21,6 @@
 
 #include "gdcmCommon.h"
 
-//-----------------------------------------------------------------------------
-#define dbg gdcmDebug::GetReference()
-
 //-----------------------------------------------------------------------------
 
 /**
@@ -56,8 +53,9 @@ private:
 /// warning message level to be displayed
    int DebugLevel;
 
-/// Instance of debugging utility.
-   static gdcmDebug debug;
 };
 
+/// Instance of debugging utility.
+static gdcmDebug dbg;
+
 #endif