adding testDICICOMDIR.cxx to check DICOMDIR utilities

[gdcm.git] / src / gdcmException.cxx

diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index e79d3225f298f7ddfad2986d3dec589273ee0aa6..aeb15c0b5760038f875af775b81204be4e0fe3e8 100644 (file)
--- a/src/gdcmException.cxx
+++ b/src/gdcmException.cxx
@@ -1,19 +1,12 @@
-#ifdef _MSC_VER
-//'identifier' : not all control paths return a value
-//#pragma warning ( disable : 4715 )
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
+// gdcmException.cxx
+//-----------------------------------------------------------------------------
 #include "gdcmException.h"
 
 #include <typeinfo>
 #include <stdio.h>
 
+//-----------------------------------------------------------------------------
+// gdcmException
 gdcmException::gdcmException(const std::string &f, const std::string& msg) throw()
 #ifdef __GNUC__
   try
@@ -27,17 +20,16 @@ catch(...) {
 #endif
 
 
-
 void gdcmException::fatal(const char *from) throw() {
   try {
-    cerr << "Fatal: exception received in " << from 
-        << " while handling exception." << endl;
+    std::cerr << "Fatal: exception received in " << from 
+        << " while handling exception." << std::endl;
     exit(-1);
   }
   catch(...) {
     try {
-      cerr << "Fatal: exception received in Exception::fatal while handling exception."
-          << endl;
+      std::cerr << "Fatal: exception received in Exception::fatal while handling exception."
+          << std::endl;
       exit(-1);
     }
     catch(...) {
@@ -46,7 +38,6 @@ void gdcmException::fatal(const char *from) throw() {
   }  
 }
 
-
 std::string gdcmException::getName() const throw() {
   try {
 #ifdef __GNUC__   // GNU C++ compiler class name demangling
@@ -78,20 +69,19 @@ std::string gdcmException::getName() const throw() {
   }
 }
 
-
 gdcmException::operator const char *() const throw() {
   return getName().c_str();
 }
 
-
-ostream& operator<<(ostream &os, const gdcmException &e) {
+//-----------------------------------------------------------------------------
+std::ostream& operator<<(std::ostream &os, const gdcmException &e) {
   try {  
-    os << "Exception " << e.getName() << " thrown: " << e.getError() << endl;
+    os << "Exception " << e.getName() << " thrown: " << e.getError() << std::endl;
   }
   catch(...) {
-    gdcmException::fatal("operator<<(ostream &, const gdcmException&)");
+    gdcmException::fatal("operator<<(std::ostream &, const gdcmException&)");
   }
   return os;
 }
 
-  
+//-----------------------------------------------------------------------------