X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmException.h;h=03d74fb996c98465bf357d8a275d0a1f32992ac1;hb=9f643008e8a960617fb30ed9dcd454612657e5d2;hp=3c30f94be732d78c03339b4a7cd9ddfb69a872c7;hpb=a76c87a014480149a0fc8524124a596083322600;p=gdcm.git

diff --git a/src/gdcmException.h b/src/gdcmException.h
index 3c30f94b..03d74fb9 100644
--- a/src/gdcmException.h
+++ b/src/gdcmException.h
@@ -1,40 +1,20 @@
-// gdcm.h
-
-// gdcmlib Intro:  
-// * gdcmlib is a library dedicated to reading and writing dicom files.
-// * LGPL for the license
-// * lightweigth as opposed to CTN or DCMTK which come bundled which try
-//   to implement the full DICOM standard (networking...). gdcmlib concentrates
-//   on reading and writing
-// * Formats: this lib should be able to read ACR-NEMA v1 and v2, Dicom v3 (as
-//   stated in part10). [cf dcmtk/dcmdata/docs/datadict.txt]
-// * Targeted plateforms: Un*xes and Win32/VC++6.0
-//
-//
-
 #ifndef GDCM_EXCEPTION_H
 #define GDCM_EXCEPTION_H
 
 #include <string>
 #include <iostream>
 #include <exception>
-using namespace std;
-
-#ifdef _MSC_VER
-#define GDCM_EXPORT __declspec( dllexport )
-#else
-#define GDCM_EXPORT
-#endif
+#include "gdcmCommon.h"
 
 /**
  * Any exception thrown in the gdcm library
  */
-class GDCM_EXPORT gdcmException : public exception {
+class GDCM_EXPORT gdcmException : public std::exception {
  protected:
   /// error message
-  string from;
+  std::string from;
   /// error message
-  string error;
+  std::string error;
 
  public:
   /**
@@ -44,18 +24,18 @@ class GDCM_EXPORT gdcmException : public exception {
    * @param from name of the thrower
    * @param error error description string
    */
-  explicit gdcmException(const string &from, const string &error = "")
+  explicit gdcmException(const std::string &from, const std::string &error = "")
     throw();
   
 
   /**
-   * virtual descructor makes this class dynamic
+   * virtual destructor makes this class dynamic
    */
-  virtual ~gdcmException() {
+  virtual ~gdcmException() throw() {
   }
   
   /// returns error message
-  const string &getError(void) const throw() {
+  const std::string &getError(void) const throw() {
     return error;
   }
 
@@ -72,9 +52,9 @@ class GDCM_EXPORT gdcmException : public exception {
   static void fatal(const char *from) throw();
 
   /// try to discover this (dynamic) class name
-  virtual string getName() const throw();
+  virtual std::string getName() const throw();
 
-  friend ostream& operator<<(ostream &os, const gdcmException &e);
+  friend std::ostream& operator<<(std::ostream &os, const gdcmException &e);
   
 };
 
@@ -84,7 +64,7 @@ class GDCM_EXPORT gdcmException : public exception {
  * @param e exception to print
  * @returns output stream os
  */
-ostream& operator<<(ostream &os, const gdcmException &e);
+std::ostream& operator<<(std::ostream &os, const gdcmException &e);
 
 
 /**
@@ -99,15 +79,13 @@ class GDCM_EXPORT gdcmFileError : public gdcmException {
    * @param from name of the thrower
    * @param error error description string
    */
-  explicit gdcmFileError(const string &from,
-			 const string &error = "File error")
+  explicit gdcmFileError(const std::string &from,
+			 const std::string &error = "File error")
     throw() : gdcmException(from, error) {
   }
 };
 
 
-
-
 /**
  * Invalid file format exception
  */
@@ -120,8 +98,8 @@ class GDCM_EXPORT gdcmFormatError : public gdcmException {
    * @param from name of the thrower
    * @param error error description string
    */
-  explicit gdcmFormatError(const string &from,
-			   const string &error = "Invalid file format error")
+  explicit gdcmFormatError(const std::string &from,
+			   const std::string &error = "Invalid file format error")
     throw() : gdcmException(from, error) {
   }
 };