X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmException.h;h=0e46086034dab7f406a9b6fa0dafc88fb5d9e0f9;hb=df832cf7f90b4ca5aca2f628c1756fb276779fac;hp=c92034ecf514f02dcda024be585c8705ac85a85d;hpb=f558e91ca92b7b2b5820bebc01e000a926d0828f;p=gdcm.git

diff --git a/src/gdcmException.h b/src/gdcmException.h
index c92034ec..0e460860 100644
--- a/src/gdcmException.h
+++ b/src/gdcmException.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmException.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/11 16:36:52 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  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
@@ -16,8 +16,8 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCM_EXCEPTION_H
-#define GDCM_EXCEPTION_H
+#ifndef _GDCM_EXCEPTION_H_
+#define _GDCM_EXCEPTION_H_
 
 #include "gdcmCommon.h"
 
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <exception>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 
 //-----------------------------------------------------------------------------
@@ -47,23 +47,19 @@ public:
    /**
     * \brief virtual destructor makes this class dynamic
     */
-   virtual ~Exception() throw() {};
+   virtual ~Exception() throw() {}
 
    /// exception caught within exception class: print error message and die
    static void fatal(const char *from) throw();
 
    /// returns error message
-   const std::string &getError() const throw() {
-      return Error;
-   }
+   const std::string &getError() const throw() { return Error;}
 
    /// try to discover this (dynamic) class name
    virtual std::string getName() const throw();
 
    /// returns exception name string (overloads std::exception::what)
-   virtual const char *what() const throw() {
-      return (const char *) *this;
-   }
+   virtual const char *what() const throw() { return (const char *) *this;}
 
    /// returns exception name string
    operator const char *() const throw();