X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmException.cxx;h=3bda375a2ef15153a1818bf4b258164be3006973;hb=5e64f1feb4d82a4da9893dca043212ac90807fe4;hp=719c7744bb48c98852928f8160b55c6739d3843f;hpb=1a11accd11061d63d3c09db7b1445637207e81e4;p=gdcm.git

diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index 719c7744..3bda375a 100644
--- a/src/gdcmException.cxx
+++ b/src/gdcmException.cxx
@@ -1,83 +1,109 @@
-// gdcmException.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmException.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/11/04 18:14:34 $
+  Version:   $Revision: 1.22 $
+                                                                                
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmException.h"
 
 #include <typeinfo>
-#include <stdio.h>
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
-// gdcmException
+// Exception
 
 /**
- * \ingroup gdcmException
+ * \ingroup Exception
  * \brief constructor
  * @param f
  * @param msg  
  */
-gdcmException::gdcmException(const std::string &f, const std::string& msg) throw()
+Exception::Exception(const std::string &f, const std::string& msg) throw()
 #ifdef __GNUC__
   try
 #endif
-  : from(f), error(msg) {
+  : From(f), Error(msg) {
   }
 #ifdef __GNUC__
 catch(...) {
-  fatal("gdcmException::gdcmException(const std::string&, const std::string&, const std::string&)");
+  fatal("Exception::Exception(const std::string&, const std::string&, const std::string&)");
 }
 #endif
 
 
 /**
- * \ingroup gdcmException
+ * \ingroup Exception
  * \brief fatal
  * @param from 
  */
- void gdcmException::fatal(const char *from) throw() {
-  try {
-    std::cerr << "Fatal: exception received in " << from 
-	 << " while handling exception." << std::endl;
-    exit(-1);
-  }
-  catch(...) {
-    try {
-      std::cerr << "Fatal: exception received in Exception::fatal while handling exception."
-	   << std::endl;
-      exit(-1);
-    }
-    catch(...) {
+void Exception::fatal(const char *from) throw() {
+   try
+   {
+      std::cerr << "Fatal: exception received in " << from 
+                << " while handling exception." << std::endl;
       exit(-1);
-    }
-  }  
+   }
+   catch(...)
+   {
+      try
+      {
+         std::cerr << "Fatal: exception received in Exception::fatal while handling exception."
+                   << std::endl;
+         exit(-1);
+      }
+      catch(...)
+      {
+         exit(-1);
+      }
+   }
 }
 
 /**
- * \ingroup gdcmException
+ * \ingroup Exception
  * \brief getName
  * @return string
  */
- std::string gdcmException::getName() const throw() {
-  try {
-#ifdef __GNUC__   // GNU C++ compiler class name demangling
-      unsigned int nested = 1, i, nb, offset;
+std::string Exception::getName() const throw()
+{
+   try
+   {
+#if defined(__GNUC__) && 0   // GNU C++ compiler class name demangling
+      unsigned int nested = 1, i, nb;
+      int offset;
       std::string one;
 
       std::string name;
       std::string iname = typeid(*this).name();
-      if(iname[0] == 'Q') {
-	nested = iname[1] - '0';
-	iname = std::string(iname, 2, std::string::npos);
+      if(iname[0] == 'Q')
+      {
+         nested = iname[1] - '0';
+         iname = std::string(iname, 2, std::string::npos);
       }
-      for(i = 0; i < nested; i++) {
-	::sscanf(iname.c_str(), "%u%n", &nb, &offset);
-	iname = std::string(iname, offset, std::string::npos);
-	name += std::string(iname, 0, nb);
-	if(i + 1 < nested) name += "::";
-	iname = std::string(iname, nb, std::string::npos);
+      for(i = 0; i < nested; i++)
+      {
+         ::sscanf(iname.c_str(), "%u%n", &nb, &offset);
+         iname = std::string(iname, offset, std::string::npos);
+         name += std::string(iname, 0, nb);
+         if(i + 1 < nested) name += "::";
+         iname = std::string(iname, nb, std::string::npos);
       }
       return name;
 #else           // no class name demangling
-      //name = typeid(*this).name();
-      return "Exception";
+      std::string name = typeid(*this).name();
+      return name;
 #endif
   }
   catch(...) {
@@ -87,26 +113,26 @@ catch(...) {
 }
 
 /**
- * \ingroup gdcmException
- * \brief gdcmException::operator
+ * \ingroup Exception
+ * \brief Exception
  */
- gdcmException::operator const char *() const throw() {
+ Exception::operator const char *() const throw() {
   return getName().c_str();
 }
 
 //-----------------------------------------------------------------------------
 /**
- * \ingroup gdcmException
- * \brief gdcmException::operator <<
+ * \ingroup Exception
+ * \brief Exception::operator <<
  */
- std::ostream& operator<<(std::ostream &os, const gdcmException &e) {
+ std::ostream& operator<<(std::ostream &os, const Exception &e) {
   try {  
     os << "Exception " << e.getName() << " thrown: " << e.getError() << std::endl;
   }
   catch(...) {
-    gdcmException::fatal("operator<<(std::ostream &, const gdcmException&)");
+    Exception::fatal("operator<<(std::ostream &, const Exception&)");
   }
   return os;
 }
-
+} // end namespace gdcm
 //-----------------------------------------------------------------------------