ENH: I am a moron. Fix compilation of gdcm in static mode, I had to add some new...

[gdcm.git] / src / gdcmDebug.h

diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index a689936f29dbd1432b491ac4cf8a03efd22d7921..67d49f9edf9c002fac2e2be3d32dc8a16add3709 100644 (file)
--- a/src/gdcmDebug.h
+++ b/src/gdcmDebug.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.h,v $
   Language:  C++
-  Date:      $Date: 2004/07/19 11:51:26 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2004/09/27 08:39:05 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -21,9 +21,6 @@
 
 #include "gdcmCommon.h"
 
-//-----------------------------------------------------------------------------
-#define dbg gdcmDebug::GetReference()
-
 //-----------------------------------------------------------------------------
 
 /**
@@ -37,17 +34,18 @@
  * Shown only when the debug level is higher than the 
  * message level.
  */
-class GDCM_EXPORT gdcmDebug {
+class GDCM_EXPORT gdcmDebug
+{
 public:
    gdcmDebug(int level = -1);
 
    void SetDebug (int level);
-   void Verbose(int, const char*, const char* ="");
-   void Error(bool, const char*,  const char* ="");
-   void Error(const char*, const char* ="", const char* ="");
+   void Verbose(int level, const char* msg1, const char* msg2 = "") ;
+   void Error  (bool test, const char* msg1, const char* msg2 = "");
+   void Error  (const char* msg1, const char* msg2 = "", const char* msg3 = "");
 
-   void Assert(int, bool, const char*, const char*);
-   void Exit(int);
+   void Assert(int level, bool test, const char * msg1, const char * msg2);
+   void Exit(int a);
 
    static gdcmDebug &GetReference();
 
@@ -55,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