X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.cxx;h=6bff5c2b828c18efcd3f26921f22fa9b9b119367;hb=bde18845deffbd09ed1c154d28e09284ae39cd76;hp=2891b21cb6e358abdcc151f868420c160404a39a;hpb=c92079b4881cba2560589210d4baeed9dd4d9cac;p=gdcm.git

diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx
index 2891b21c..6bff5c2b 100644
--- a/src/gdcmDebug.cxx
+++ b/src/gdcmDebug.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/31 14:24:47 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2004/11/09 22:30:43 $
+  Version:   $Revision: 1.12 $
                                                                                 
   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,15 +19,15 @@
 #include <iostream>
 #include "gdcmDebug.h"
 
-//-----------------------------------------------------------------------------
-gdcmDebug gdcmDebug::debug;
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 /**
  * \brief   constructor
  * @param level debug level
  */ 
-gdcmDebug::gdcmDebug(int level) 
+Debug::Debug(int level) 
 {
    DebugLevel = level;
 }
@@ -36,7 +36,7 @@ gdcmDebug::gdcmDebug(int level)
  * \brief   Accessor
  * @param   level Set the debug level
  */ 
-void gdcmDebug::SetDebug(int level) 
+void Debug::SetDebug(int level) 
 {
    DebugLevel = level;
 }
@@ -47,13 +47,13 @@ void gdcmDebug::SetDebug(int level)
  * @param msg1 first message part
  * @param msg2 second message part 
  */
-void gdcmDebug::Verbose(int level, const char * msg1, const char * msg2) 
+void Debug::Verbose(int level, const char * msg1, const char * msg2) 
 {
    if (level > DebugLevel)
    {
       return ;
    }
-   std::cerr << msg1 << ' ' << msg2 << std::endl;
+   std::cerr << "gdcm::" << msg1 << ' ' << msg2 << std::endl << std::flush;
 }
 
 /**
@@ -62,13 +62,13 @@ void gdcmDebug::Verbose(int level, const char * msg1, const char * msg2)
  * @param msg1 first message part
  * @param msg2 second message part 
  */
-void gdcmDebug::Error(bool test, const char * msg1, const char * msg2) 
+void Debug::Error(bool test, const char * msg1, const char * msg2) 
 {
    if (!test)
    {
       return;
    }
-   std::cerr << msg1 << ' ' << msg2 << std::endl;
+   std::cerr << "gdcm::" << msg1 << ' ' << msg2 << std::endl << std::flush;
    Exit(1);
 }
 
@@ -78,10 +78,11 @@ void gdcmDebug::Error(bool test, const char * msg1, const char * msg2)
  * @param msg2 second message part
  * @param msg3 Third message part  
  */
-void gdcmDebug::Error(const char* msg1, const char* msg2,
+void Debug::Error(const char* msg1, const char* msg2,
                       const char* msg3) 
 {
-   std::cerr << msg1 << ' ' << msg2 << ' ' << msg3 << std::endl;
+   std::cerr << "gdcm::" << msg1 << ' ' << msg2 << ' ' << msg3
+             << std::endl << std::flush;
    Exit(1);
 }
 
@@ -92,7 +93,7 @@ void gdcmDebug::Error(const char* msg1, const char* msg2,
  * @param msg1 first message part
  * @param msg2 second message part
  */
-void gdcmDebug::Assert(int level, bool test, const char * msg1, 
+void Debug::Assert(int level, bool test, const char * msg1, 
                        const char * msg2) 
 {
    if (level > DebugLevel)
@@ -101,7 +102,8 @@ void gdcmDebug::Assert(int level, bool test, const char * msg1,
    }
    if (!test)
    {
-      std::cerr << msg1 << ' ' << msg2 << std::endl;
+      std::cerr << "gdcm::" <<  msg1 << ' ' << msg2
+                << std::endl << std::flush;
    }
 }
 
@@ -109,22 +111,14 @@ void gdcmDebug::Assert(int level, bool test, const char * msg1,
  * \brief   Exit 
  * @param a return code 
  */
-void gdcmDebug::Exit(int a) 
+void Debug::Exit(int a) 
 {
 #ifdef __GNUC__
    std::exit(a);
 #endif
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)
    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;
-}
-
+} // end namespace gdcm