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

[gdcm.git] / src / gdcmDebug.cxx

diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx
index e98811056dff0e3cb44d17f1d82be1df2c6ca7eb..ebcc95c2fca9198e711e2f47de5ac7c9ec18819e 100644 (file)
--- a/src/gdcmDebug.cxx
+++ b/src/gdcmDebug.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/19 11:51:26 $
-  Version:   $Revision: 1.3 $
+  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
@@ -19,9 +19,6 @@
 #include <iostream>
 #include "gdcmDebug.h"
 
-//-----------------------------------------------------------------------------
-gdcmDebug gdcmDebug::debug;
-
 //-----------------------------------------------------------------------------
 /**
  * \brief   constructor
@@ -43,58 +40,66 @@ void gdcmDebug::SetDebug(int level)
 
 /**
  * \brief   Verbose 
- * @param Level level
- * @param Msg1 first message part
- * @param Msg2 second message part 
+ * @param level level
+ * @param msg1 first message part
+ * @param msg2 second message part 
  */
-void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) 
+void gdcmDebug::Verbose(int level, const char * msg1, const char * msg2) 
 {
-   if (Level > DebugLevel)
+   if (level > DebugLevel)
+   {
       return ;
-   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
+   }
+   std::cerr << msg1 << ' ' << msg2 << std::endl;
 }
 
 /**
  * \brief   Error 
- * @param Test test
- * @param Msg1 first message part
- * @param Msg2 second message part 
+ * @param test test
+ * @param msg1 first message part
+ * @param msg2 second message part 
  */
-void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) 
+void gdcmDebug::Error(bool test, const char * msg1, const char * msg2) 
 {
-   if (!Test)
+   if (!test)
+   {
       return;
-   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
+   }
+   std::cerr << msg1 << ' ' << msg2 << std::endl;
    Exit(1);
 }
 
 /**
  * \brief   Error 
- * @param Msg1 first message part
- * @param Msg2 second message part
- * @param Msg3 Third message part  
+ * @param msg1 first message part
+ * @param msg2 second message part
+ * @param msg3 Third message part  
  */
-void gdcmDebug::Error(const char* Msg1, const char* Msg2,
-                      const char* Msg3) 
+void gdcmDebug::Error(const char* msg1, const char* msg2,
+                      const char* msg3) 
 {
-   std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << std::endl;
+   std::cerr << msg1 << ' ' << msg2 << ' ' << msg3 << std::endl;
    Exit(1);
 }
 
 /**
  * \brief   Assert 
- * @param Level level 
- * @param Test test
- * @param Msg1 first message part
- * @param Msg2 second message part
+ * @param level level 
+ * @param test test
+ * @param msg1 first message part
+ * @param msg2 second message part
  */
-void gdcmDebug::Assert(int Level, bool Test,
-                 const char * Msg1, const char * Msg2) 
+void gdcmDebug::Assert(int level, bool test, const char * msg1, 
+                       const char * msg2) 
 {
-   if (Level > DebugLevel)
+   if (level > DebugLevel)
+   {
       return ;
-   if (!Test)
-      std::cerr << Msg1 << ' ' << Msg2 << std::endl;
+   }
+   if (!test)
+   {
+      std::cerr << msg1 << ' ' << msg2 << std::endl;
+   }
 }
 
 /**
@@ -110,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;
-}
-