X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmException.cxx;h=aeb15c0b5760038f875af775b81204be4e0fe3e8;hb=1ca5d71344bd934cb05d810428cdd1182e86f9f2;hp=66bcb985cfe01e67e7b337f67b21fb33bbff975c;hpb=b950a88db3b779f409f548361bbc62882094b9fb;p=gdcm.git

diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index 66bcb985..aeb15c0b 100644
--- 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,7 +20,6 @@ catch(...) {
 #endif
 
 
-
 void gdcmException::fatal(const char *from) throw() {
   try {
     std::cerr << "Fatal: exception received in " << from 
@@ -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() << std::endl;
   }
   catch(...) {
-    gdcmException::fatal("operator<<(ostream &, const gdcmException&)");
+    gdcmException::fatal("operator<<(std::ostream &, const gdcmException&)");
   }
   return os;
 }
 
-  
+//-----------------------------------------------------------------------------