Merge with version on tag OCC-V2_1_0d

[modules/visu.git] / src / CONVERTOR / VISUConvertor.cxx

diff --git a/src/CONVERTOR/VISUConvertor.cxx b/src/CONVERTOR/VISUConvertor.cxx
index 79856149c9b8d9a36bc88dcf14e55fbf82eca278..24f787c28ac3ae13550d571c254715ebfa9f623c 100644 (file)
--- a/src/CONVERTOR/VISUConvertor.cxx
+++ b/src/CONVERTOR/VISUConvertor.cxx
@@ -45,7 +45,7 @@ static int MYDEBUG = 0;
 
 void parseFile(const char* theFileName) {
   try{
-    cout<<"'"<<theFileName<<"'...\n";
+    MESSAGE("'"<<theFileName<<"'...");
     auto_ptr<VISU_Convertor> aCon(CreateConvertor(theFileName));
     //aCon->GetSize();
     //return;
@@ -104,11 +104,11 @@ void parseFile(const char* theFileName) {
       }
     }
   OK:
-    cout<<"OK"<<endl;
-  }catch(std::runtime_error& exc){
-    MESSAGE("Follow exception was accured in file:"<<theFileName<<"\n"<<exc.what());
+    MESSAGE("OK");
+  }catch(std::exception& exc){
+    MESSAGE("Follow exception was occured in file:"<<theFileName<<"\n"<<exc.what());
   }catch(...){
-    MESSAGE("Unknown exception was accured in VISU_Convertor_impl in file:"<<theFileName);
+    MESSAGE("Unknown exception was occured in VISU_Convertor_impl in file:"<<theFileName);
   } 
 }
 
@@ -132,10 +132,10 @@ int main(int argc, char** argv){
       }
       return 0;
     }
-  }catch(std::runtime_error& exc){
-    cout<<"Follow exception was accured :\n"<<exc.what()<<endl;
+  }catch(std::exception& exc){
+    MESSAGE("Follow exception was occured :\n"<<exc.what());
   }catch(...){
-    cout<<"Unknown exception was accured in VISU_Convertor_impl"<<endl;
+    MESSAGE("Unknown exception was occured in VISU_Convertor_impl");
   } 
   return 1;
 }