Merging from V4_1_0_maintainance for porting on Win32 Platform

[modules/kernel.git] / src / SALOMEDSImpl / SALOMEDSImpl_StudyManager.cxx

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
index bd904c91b332fa133622a0fcd6e8ce920b26c6c3..50099bcc9cc29bbb1486110446a1b38276be158b 100644 (file)
--- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.cxx
@@ -134,18 +134,12 @@ SALOMEDSImpl_Study* SALOMEDSImpl_StudyManager::Open(const string& aUrl)
   }
   catch (HDFexception)
     {
-//#ifndef WNT
-//      char eStr[strlen(aUrl.ToCString())+17];
-//#else
-         char *eStr;
-         eStr = new char[strlen(aUrl.c_str())+17];
-//#endif
-      sprintf(eStr,"Can't open file %s",aUrl.c_str());
-//#ifdef WNT
-         delete [] eStr;
-//#endif
-      _errorCode = string(eStr);
-      return NULL;
+       char *eStr;
+       eStr = new char[strlen(aUrl.c_str())+17];
+        sprintf(eStr,"Can't open file %s",aUrl.c_str());
+        delete [] eStr;
+        _errorCode = string(eStr);
+        return NULL;
     }
 
   // Temporary aStudyUrl in place of study name
@@ -174,11 +168,7 @@ SALOMEDSImpl_Study* SALOMEDSImpl_StudyManager::Open(const string& aUrl)
   }
   catch (HDFexception)
     {
-//#ifndef WNT
-//      char eStr[strlen(aUrl.ToCString())+17];
-//#else
-         char *eStr = new char [strlen(aUrl.c_str())+17];
-//#endif
+      char *eStr = new char [strlen(aUrl.c_str())+17];
       sprintf(eStr,"Can't open file %s", aUrl.c_str());
       _errorCode = string(eStr);
       return NULL;