X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmException.cxx;h=bea47bb10a875eb4aed13fa3ab1bcaaa2a65c951;hb=2a2c07baafb13cec37daad51975f394541406eac;hp=375820b4212e5268bec553cff968c014b95b7763;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git

diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index 375820b4..bea47bb1 100644
--- a/src/gdcmException.cxx
+++ b/src/gdcmException.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmException.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:46 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/01/18 14:28:32 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,12 +26,11 @@ namespace gdcm
 // Exception
 
 /**
- * \ingroup Exception
  * \brief constructor
- * @param f
- * @param msg  
+ * @param f f
+ * @param msg msg 
  */
-Exception::Exception(const std::string &f, const std::string& msg) throw()
+Exception::Exception(const std::string &f, const std::string &msg) throw()
 #ifdef __GNUC__
   try
 #endif
@@ -45,9 +44,8 @@ catch(...) {
 
 
 /**
- * \ingroup Exception
  * \brief fatal
- * @param from 
+ * @param from from
  */
 void Exception::fatal(const char *from) throw() {
    try
@@ -72,7 +70,6 @@ void Exception::fatal(const char *from) throw() {
 }
 
 /**
- * \ingroup Exception
  * \brief getName
  * @return string
  */
@@ -80,8 +77,9 @@ std::string Exception::getName() const throw()
 {
    try
    {
-#ifdef __GNUC__   // GNU C++ compiler class name demangling
-      unsigned int nested = 1, i, nb, offset;
+#if defined(__GNUC__) && 0   // GNU C++ compiler class name demangling
+      unsigned int nested = 1, i, nb;
+      int offset;
       std::string one;
 
       std::string name;
@@ -101,8 +99,8 @@ std::string Exception::getName() const throw()
       }
       return name;
 #else           // no class name demangling
-      //name = typeid(*this).name();
-      return "Exception";
+      std::string name = typeid(*this).name();
+      return name;
 #endif
   }
   catch(...) {
@@ -112,7 +110,6 @@ std::string Exception::getName() const throw()
 }
 
 /**
- * \ingroup Exception
  * \brief Exception
  */
  Exception::operator const char *() const throw() {
@@ -121,8 +118,9 @@ std::string Exception::getName() const throw()
 
 //-----------------------------------------------------------------------------
 /**
- * \ingroup Exception
  * \brief Exception::operator <<
+ * @param os ostream to write to
+ * @param e exception to raise
  */
  std::ostream& operator<<(std::ostream &os, const Exception &e) {
   try {