X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmException.cxx;h=d2d3d7cd030221b5c11ba898d5998cff8c5080eb;hb=5ac99b2ea4c9e64dcfb0dffff620c2d1a7e84aba;hp=53d40a73c0af6ab282e7cfbb6ad3d1ed55dddab9;hpb=eb941e8785d3742b8a6a1aac964d43dcb4cf49f0;p=gdcm.git

diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index 53d40a73..d2d3d7cd 100644
--- a/src/gdcmException.cxx
+++ b/src/gdcmException.cxx
@@ -1,22 +1,10 @@
-#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
 
 #include "gdcmException.h"
 
 #include <typeinfo>
 #include <stdio.h>
-using namespace std;
 
-
-gdcmException::gdcmException(const string &f, const string& msg) throw()
+gdcmException::gdcmException(const std::string &f, const std::string& msg) throw()
 #ifdef __GNUC__
   try
 #endif
@@ -32,14 +20,14 @@ catch(...) {
 
 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(...) {
@@ -49,24 +37,24 @@ void gdcmException::fatal(const char *from) throw() {
 }
 
 
-string gdcmException::getName() const throw() {
+std::string gdcmException::getName() const throw() {
   try {
 #ifdef __GNUC__   // GNU C++ compiler class name demangling
       unsigned int nested = 1, i, nb, offset;
-      string one;
+      std::string one;
 
-      string name;
-      string iname = typeid(*this).name();
+      std::string name;
+      std::string iname = typeid(*this).name();
       if(iname[0] == 'Q') {
 	nested = iname[1] - '0';
-	iname = string(iname, 2, std::string::npos);
+	iname = std::string(iname, 2, std::string::npos);
       }
       for(i = 0; i < nested; i++) {
 	::sscanf(iname.c_str(), "%u%n", &nb, &offset);
-	iname = string(iname, offset, std::string::npos);
-	name += string(iname, 0, nb);
+	iname = std::string(iname, offset, std::string::npos);
+	name += std::string(iname, 0, nb);
 	if(i + 1 < nested) name += "::";
-	iname = string(iname, nb, std::string::npos);
+	iname = std::string(iname, nb, std::string::npos);
       }
       return name;
 #else             // no class name demangling
@@ -75,7 +63,7 @@ string gdcmException::getName() const throw() {
 #endif
   }
   catch(...) {
-    fatal("Exception::getName(string &)");
+    fatal("Exception::getName(std::string &)");
     return "";
   }
 }
@@ -86,12 +74,12 @@ gdcmException::operator const char *() const throw() {
 }
 
 
-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;
 }