ENH: What the hell! There is no way it compiles on Win32

[gdcm.git] / src / gdcmException.cxx

diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index 037156051d30ba1abb35afe9a428e66aeca620f5..f51f6e4c787253f03401efada3dbaaf25e8918f1 100644 (file)
--- a/src/gdcmException.cxx
+++ b/src/gdcmException.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmException.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:47 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2004/08/16 04:25:18 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -34,7 +34,7 @@ gdcmException::gdcmException(const std::string &f, const std::string& msg) throw
 #ifdef __GNUC__
   try
 #endif
-  : from(f), error(msg) {
+  : From(f), Error(msg) {
   }
 #ifdef __GNUC__
 catch(...) {
@@ -48,22 +48,26 @@ catch(...) {
  * \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 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(...)
+      {
+         exit(-1);
+      }
+   }
 }
 
 /**
@@ -71,24 +75,28 @@ catch(...) {
  * \brief getName
  * @return string
  */
- std::string gdcmException::getName() const throw() {
-  try {
+std::string gdcmException::getName() const throw()
+{
+   try
+   {
 #ifdef __GNUC__   // GNU C++ compiler class name demangling
       unsigned int nested = 1, i, nb, 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