From: env <env@opencascade.com>
Date: Tue, 26 Jul 2005 09:02:43 +0000 (+0000)
Subject: ENV: Windows porting.
X-Git-Tag: V3_0_1~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=dd7a5907b50fc7bf89fd7597708d0c00cbb4111d;p=modules%2Fkernel.git

ENV: Windows porting.
---

diff --git a/src/SALOMEDS/SALOMEDS.cxx b/src/SALOMEDS/SALOMEDS.cxx
index 1cebce2ed..ae488ad0a 100644
--- a/src/SALOMEDS/SALOMEDS.cxx
+++ b/src/SALOMEDS/SALOMEDS.cxx
@@ -27,7 +27,11 @@
 //  $Header$
 
 
+#ifndef WNT
 #include <SALOMEDS.hxx>
+#else
+#include "SALOMEDS.hxx"
+#endif
 
 using namespace SALOMEDS;
 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx
index 737ee2bf2..ee2d75a09 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeComment_i.cxx
@@ -2,13 +2,15 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeComment_i.hxx"
 
 #include <TCollection_ExtendedString.hxx>
 #include "SALOMEDS_SObject_i.hxx"
 #include "SALOMEDS.hxx"
 
+using namespace std;
+
 char* SALOMEDS_AttributeComment_i::Value()
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx
index 675361f98..4f68a4b83 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeDrawable_i.cxx
@@ -3,10 +3,12 @@
 //  Module : SALOME
 
 
-using namespace std;
+
 #include "SALOMEDS_AttributeDrawable_i.hxx"
 #include "SALOMEDS.hxx"
 
+using namespace std;
+
 CORBA::Boolean SALOMEDS_AttributeDrawable_i::IsDrawable() 
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx
index 192a9ba8d..5cff0d380 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeExpandable_i.cxx
@@ -2,10 +2,12 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeExpandable_i.hxx"
 #include "SALOMEDS.hxx"
 
+using namespace std;
+
 CORBA::Boolean SALOMEDS_AttributeExpandable_i::IsExpandable() 
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributeExternalFileDef_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeExternalFileDef_i.cxx
index 9795c3342..d25c454f6 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeExternalFileDef_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeExternalFileDef_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeExternalFileDef_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TCollection_ExtendedString.hxx>
 
+using namespace std;
+
 char* SALOMEDS_AttributeExternalFileDef_i::Value()
 {  
   SALOMEDS::Locker lock; 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeFileType_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeFileType_i.cxx
index 84bdab1e9..c94f3b70d 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeFileType_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeFileType_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeFileType_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TCollection_ExtendedString.hxx>
 
+using namespace std;
+
 char* SALOMEDS_AttributeFileType_i::Value()
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributeFlags_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeFlags_i.cxx
index f26712d2a..9bbe0fd66 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeFlags_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeFlags_i.cxx
@@ -2,10 +2,12 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeFlags_i.hxx"
 #include "SALOMEDS.hxx"  
 
+using namespace std;
+
 /*
   Class       : SALOMEDS_AttributeFlags_i
   Description : This class is intended for storing different object attributes that
diff --git a/src/SALOMEDS/SALOMEDS_AttributeGraphic_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeGraphic_i.cxx
index cc94d8d81..54eca3453 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeGraphic_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeGraphic_i.cxx
@@ -2,10 +2,12 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeGraphic_i.hxx"
 #include "SALOMEDS.hxx" 
 
+using namespace std;
+
 /*
   Class       : SALOMEDS_AttributeGraphic_i
   Description : This class is intended for storing information about
diff --git a/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx
index 292a5a901..24309b32a 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeIOR_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeIOR_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TCollection_ExtendedString.hxx>
 
+using namespace std;
+
 char* SALOMEDS_AttributeIOR_i::Value()
 {
  SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx
index 601956099..1766ccf87 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeInteger_i.cxx
@@ -2,10 +2,12 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeInteger_i.hxx"
 #include "SALOMEDS.hxx"
 
+using namespace std;
+
 CORBA::Long SALOMEDS_AttributeInteger_i::Value() 
 {
   SALOMEDS::Locker lock; 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx
index 23e4cf152..79231218e 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeLocalID_i.cxx
@@ -2,10 +2,12 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeLocalID_i.hxx"
 #include "SALOMEDS.hxx"
 
+using namespace std;
+
 CORBA::Long SALOMEDS_AttributeLocalID_i::Value() 
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx
index 5bb4cf13f..65483a3a3 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeName_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeName_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TCollection_ExtendedString.hxx>
 
+using namespace std;
+
 char* SALOMEDS_AttributeName_i::Value() 
 {
   SALOMEDS::Locker lock; 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx
index a1e77dc16..0a7445dd6 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeOpened_i.cxx
@@ -2,10 +2,12 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeOpened_i.hxx"
 #include "SALOMEDS.hxx"
 
+using namespace std;
+
 CORBA::Boolean SALOMEDS_AttributeOpened_i::IsOpened() 
 {
   SALOMEDS::Locker lock; 
diff --git a/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx b/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx
index cabd447ac..1add1e193 100644
--- a/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributePersistentRef_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributePersistentRef_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TCollection_ExtendedString.hxx>
 
+using namespace std;
+
 char* SALOMEDS_AttributePersistentRef_i::Value()
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx b/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx
index df6f837fd..9774a1004 100644
--- a/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributePixMap_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributePixMap_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TCollection_AsciiString.hxx>
 
+using namespace std;
+
 CORBA::Boolean SALOMEDS_AttributePixMap_i::HasPixMap() 
 {
   return Handle(SALOMEDSImpl_AttributePixMap)::DownCast(_impl)->HasPixMap();
diff --git a/src/SALOMEDS/SALOMEDS_AttributePythonObject.hxx b/src/SALOMEDS/SALOMEDS_AttributePythonObject.hxx
index 1247df4e7..e5f12b2dc 100644
--- a/src/SALOMEDS/SALOMEDS_AttributePythonObject.hxx
+++ b/src/SALOMEDS/SALOMEDS_AttributePythonObject.hxx
@@ -14,6 +14,11 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 
+
+#ifdef GetObject
+#undef GetObject
+#endif
+
 class SALOMEDS_AttributePythonObject: public SALOMEDS_GenericAttribute, public SALOMEDSClient_AttributePythonObject
 {
 public:  
diff --git a/src/SALOMEDS/SALOMEDS_AttributePythonObject_i.cxx b/src/SALOMEDS/SALOMEDS_AttributePythonObject_i.cxx
index c8f4b886b..59dcf552e 100644
--- a/src/SALOMEDS/SALOMEDS_AttributePythonObject_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributePythonObject_i.cxx
@@ -2,12 +2,14 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributePythonObject_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TCollection_ExtendedString.hxx>
 #include <TColStd_HArray1OfCharacter.hxx>
 
+using namespace std;
+
 void SALOMEDS_AttributePythonObject_i::SetObject(const char* theSequence, CORBA::Boolean IsScript) 
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx
index eb89f24dc..a83c79c16 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeSelectable_i.cxx
@@ -2,10 +2,12 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeSelectable_i.hxx"
 #include "SALOMEDS.hxx"
 
+using namespace std;
+
 CORBA::Boolean SALOMEDS_AttributeSelectable_i::IsSelectable() 
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx
index 7e9b96798..0fccb55c0 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfInteger_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeSequenceOfInteger_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TColStd_HSequenceOfInteger.hxx>
 
+using namespace std;
+
 
 void SALOMEDS_AttributeSequenceOfInteger_i::Assign(const SALOMEDS::LongSeq& other) 
 {
diff --git a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.cxx
index 583721d41..bf97ab386 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeSequenceOfReal_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeSequenceOfReal_i.hxx"
 #include "SALOMEDS.hxx" 
 #include <TColStd_HSequenceOfReal.hxx>
 
+using namespace std;
+
 void SALOMEDS_AttributeSequenceOfReal_i::Assign(const SALOMEDS::DoubleSeq& other) 
 {
   SALOMEDS::Locker lock; 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties.cxx b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties.cxx
index 092c5a417..09bb75f94 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties.cxx
@@ -36,7 +36,11 @@ std::string SALOMEDS_AttributeStudyProperties::GetUserName()
     TCollection_AsciiString N = Handle(SALOMEDSImpl_AttributeStudyProperties)::DownCast(_local_impl)->GetCreatorName();
     aName = N.ToCString();
   }
+#ifndef WNT
   else aName = SALOMEDS::AttributeStudyProperties::_narrow(_corba_impl)->GetUserName();
+#else
+  else aName = SALOMEDS::AttributeStudyProperties::_narrow(_corba_impl)->GetUserNameA();
+#endif
   return aName;
 }
 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties.hxx b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties.hxx
index 39c2af10b..4bd080eca 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties.hxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties.hxx
@@ -17,6 +17,10 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 
+#ifdef GetUserName
+#undef GetUserName
+#endif
+
 class SALOMEDS_AttributeStudyProperties: public SALOMEDS_GenericAttribute, public SALOMEDSClient_AttributeStudyProperties
 {
 public:
diff --git a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx
index baa75a717..774646de7 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeStudyProperties_i.cxx
@@ -2,13 +2,15 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeStudyProperties_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TColStd_HSequenceOfExtendedString.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
 #include <TCollection_ExtendedString.hxx>
 
+using namespace std;
+
 #define CREATION_MODE_NOTDEFINED 0
 #define CREATION_MODE_SCRATCH 1
 #define CREATION_MODE_COPY 2
diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx
index d8adf45ba..0c97e6246 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfInteger_i.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeTableOfInteger_i.hxx"
 #include "SALOMEDS.hxx"
 
@@ -15,6 +15,8 @@ using namespace std;
 #include <strstream>
 #include <string>
 
+using namespace std;
+
 UNEXPECT_CATCH(ATI_IncorrectIndex, SALOMEDS::AttributeTableOfInteger::IncorrectIndex);
 UNEXPECT_CATCH(ATI_IncorrectArgumentLength, SALOMEDS::AttributeTableOfInteger::IncorrectArgumentLength);
 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx
index 6dee8f868..0a9898a7e 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfReal_i.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeTableOfReal_i.hxx"
 #include "SALOMEDS.hxx"
 
@@ -13,6 +13,8 @@ using namespace std;
 #include <strstream>
 #include <string>
 
+using namespace std;
+
 #include "Utils_ExceptHandlers.hxx"
 UNEXPECT_CATCH(ATR_IncorrectIndex, SALOMEDS::AttributeTableOfReal::IncorrectIndex);
 UNEXPECT_CATCH(ATR_IncorrectArgumentLength, SALOMEDS::AttributeTableOfReal::IncorrectArgumentLength);
@@ -137,7 +139,7 @@ SALOMEDS::StringSeq* SALOMEDS_AttributeTableOfReal_i::GetRowUnits()
   SALOMEDS::StringSeq_var aUnits = new SALOMEDS::StringSeq;
   aUnits->length(aTable->GetNbRows());
   for(int i = 0; i < aUnits->length(); i++)
-    aUnits[i] = CORBA::string_dup(TCollection_AsciiString(aTable->GetRowUnit(i + 1)).ToCString());
+    aUnits[i] = CORBA::string_dup(TCollection_AsciiString(aTable->GetRowTitle(i + 1)).ToCString());
   return aUnits._retn();
 }
 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx
index 7523eaed4..573920cc6 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTableOfString_i.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include <TCollection_ExtendedString.hxx>
 #include <TCollection_AsciiString.hxx>
 
@@ -17,6 +17,9 @@ using namespace std;
 #include <string>
 
 #include "Utils_ExceptHandlers.hxx"
+
+using namespace std;
+
 UNEXPECT_CATCH(ATS_IncorrectIndex, SALOMEDS::AttributeTableOfString::IncorrectIndex);
 UNEXPECT_CATCH(ATS_IncorrectArgumentLength, SALOMEDS::AttributeTableOfString::IncorrectArgumentLength);
 
@@ -140,7 +143,7 @@ SALOMEDS::StringSeq* SALOMEDS_AttributeTableOfString_i::GetRowUnits()
   SALOMEDS::StringSeq_var aUnits = new SALOMEDS::StringSeq;
   aUnits->length(aTable->GetNbRows());
   for(int i = 0; i < aUnits->length(); i++)
-    aUnits[i] = CORBA::string_dup(TCollection_AsciiString(aTable->GetRowUnit(i + 1)).ToCString());
+    aUnits[i] = CORBA::string_dup(TCollection_AsciiString(aTable->GetRowTitle(i + 1)).ToCString());
   return aUnits._retn();
 }
 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx
index 07929e3fe..98ff924ad 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTarget_i.cxx
@@ -3,7 +3,7 @@
 //  Module : SALOME
 
 
-using namespace std;
+
 #include "SALOMEDS_AttributeTarget_i.hxx"
 #include "SALOMEDSImpl_SObject.hxx"
 #include "SALOMEDSImpl_Study.hxx"
@@ -11,6 +11,8 @@ using namespace std;
 
 #include <TColStd_HSequenceOfTransient.hxx>
 
+using namespace std;
+
 void SALOMEDS_AttributeTarget_i::Add(SALOMEDS::SObject_ptr anObject) 
 {
   SALOMEDS::Locker lock; 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeTextColor_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTextColor_i.cxx
index eafff6072..4b9d928d6 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTextColor_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTextColor_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeTextColor_i.hxx"
 #include "SALOMEDS.hxx" 
 #include <TColStd_HArray1OfReal.hxx>
 
+using namespace std;
+
 SALOMEDS::Color SALOMEDS_AttributeTextColor_i::TextColor() 
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx
index edc95c070..8de0bd4c5 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTextHighlightColor_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeTextHighlightColor_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TColStd_HArray1OfReal.hxx>
 
+using namespace std;
+
 SALOMEDS::Color SALOMEDS_AttributeTextHighlightColor_i::TextHighlightColor() 
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx
index 83a467215..22b6864c0 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTreeNode_i.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeTreeNode_i.hxx"
 #include "utilities.h"
 #include "SALOMEDS.hxx"
@@ -11,6 +11,8 @@ using namespace std;
 #include <TDF_Tool.hxx>
 #include <TDF_Data.hxx>
 
+using namespace std;
+
 static Handle(SALOMEDSImpl_AttributeTreeNode) GetNode(SALOMEDS::AttributeTreeNode_ptr value,
 						      const Handle(SALOMEDSImpl_AttributeTreeNode)& aNode) 
 {
@@ -49,7 +51,11 @@ SALOMEDS::AttributeTreeNode_ptr SALOMEDS_AttributeTreeNode_i::GetFather()
   SALOMEDS::Locker lock;
   SALOMEDS_AttributeTreeNode_i* aFather;
   aFather = new SALOMEDS_AttributeTreeNode_i(Handle(SALOMEDSImpl_AttributeTreeNode)::DownCast(_impl)->GetFather(), _orb);
+#ifndef WNT
   return aFather->POA_SALOMEDS::AttributeTreeNode::_this();
+#else
+  return aFather->AttributeTreeNode::_this();
+#endif
 }
 
 void SALOMEDS_AttributeTreeNode_i::SetPrevious(SALOMEDS::AttributeTreeNode_ptr value) 
@@ -71,7 +77,11 @@ SALOMEDS::AttributeTreeNode_ptr SALOMEDS_AttributeTreeNode_i::GetPrevious()
   SALOMEDS::Locker lock;
   SALOMEDS_AttributeTreeNode_i* aPrevious;
   aPrevious=new SALOMEDS_AttributeTreeNode_i(Handle(SALOMEDSImpl_AttributeTreeNode)::DownCast(_impl)->GetPrevious(), _orb);
+#ifndef WNT
   return aPrevious->POA_SALOMEDS::AttributeTreeNode::_this();
+#else
+  return aPrevious->AttributeTreeNode::_this();
+#endif
 }
 
 void SALOMEDS_AttributeTreeNode_i::SetNext(SALOMEDS::AttributeTreeNode_ptr value) 
@@ -93,7 +103,11 @@ SALOMEDS::AttributeTreeNode_ptr SALOMEDS_AttributeTreeNode_i::GetNext()
   SALOMEDS::Locker lock;
   SALOMEDS_AttributeTreeNode_i* aNext;
   aNext = new SALOMEDS_AttributeTreeNode_i(Handle(SALOMEDSImpl_AttributeTreeNode)::DownCast(_impl)->GetNext(), _orb);
+#ifndef WNT
   return aNext->POA_SALOMEDS::AttributeTreeNode::_this();
+#else
+  return aNext->AttributeTreeNode::_this();
+#endif
 }
 
 void SALOMEDS_AttributeTreeNode_i::SetFirst(SALOMEDS::AttributeTreeNode_ptr value) 
@@ -115,7 +129,11 @@ SALOMEDS::AttributeTreeNode_ptr SALOMEDS_AttributeTreeNode_i::GetFirst()
   SALOMEDS::Locker lock;
   SALOMEDS_AttributeTreeNode_i* aFirst;
   aFirst = new SALOMEDS_AttributeTreeNode_i(Handle(SALOMEDSImpl_AttributeTreeNode)::DownCast(_impl)->GetFirst(), _orb);
+#ifndef WNT
   return aFirst->POA_SALOMEDS::AttributeTreeNode::_this();
+#else
+  return aFirst->AttributeTreeNode::_this();
+#endif
 }
 
 void SALOMEDS_AttributeTreeNode_i::SetTreeID(const char* value) 
diff --git a/src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx
index 1e74b0e92..632d63cfc 100644
--- a/src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeUserID_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_AttributeUserID_i.hxx"
 #include "SALOMEDS.hxx"
 #include <TCollection_ExtendedString.hxx>
 
+using namespace std;
+
 char* SALOMEDS_AttributeUserID_i::Value() 
 {
   SALOMEDS::Locker lock;
diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator.cxx b/src/SALOMEDS/SALOMEDS_ChildIterator.cxx
index 78d9e3e99..e9dd1d4bc 100644
--- a/src/SALOMEDS/SALOMEDS_ChildIterator.cxx
+++ b/src/SALOMEDS/SALOMEDS_ChildIterator.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std; 
+
 
 #include "SALOMEDS_ChildIterator.hxx"
 #include "SALOMEDS_SObject.hxx"
 
+using namespace std; 
+
 SALOMEDS_ChildIterator::SALOMEDS_ChildIterator(const Handle(SALOMEDSImpl_ChildIterator)& theIterator)
 {
   _isLocal = true;
diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
index 6f704fefd..d57b0971c 100644
--- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_ChildIterator_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include "SALOMEDS.hxx"
@@ -10,6 +10,8 @@ using namespace std;
 #include "SALOMEDSImpl_Study.hxx"
 #include "utilities.h"
 
+using namespace std;
+
 //============================================================================
 /*! Function : constructor
  *  Purpose  :
diff --git a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
index 0b4ae30ed..e2baa2071 100644
--- a/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx
@@ -6,7 +6,7 @@
 #define __SALOMEDS_CHILDITERATOR_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>
diff --git a/src/SALOMEDS/SALOMEDS_Driver_i.cxx b/src/SALOMEDS/SALOMEDS_Driver_i.cxx
index c41a25869..6522ef242 100644
--- a/src/SALOMEDS/SALOMEDS_Driver_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_Driver_i.cxx
@@ -1,4 +1,4 @@
-using namespace std;  
+
 
 #include "SALOMEDS_Driver_i.hxx"
 #include "utilities.h"
@@ -8,6 +8,8 @@ using namespace std;
 #include "SALOMEDS.hxx"
 #include <stdlib.h>
 
+using namespace std;  
+
 SALOMEDS_Driver_i::~SALOMEDS_Driver_i()
 {
 }
diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx b/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
index 2bf6755fb..c1c4e23c4 100644
--- a/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
+++ b/src/SALOMEDS/SALOMEDS_GenericAttribute.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std; 
+
 
 #include <string>
 #include <TCollection_AsciiString.hxx> 
@@ -21,6 +21,8 @@ using namespace std;
 
 #include "OpUtil.hxx"
 
+using namespace std; 
+
 SALOMEDS_GenericAttribute::SALOMEDS_GenericAttribute(const Handle(SALOMEDSImpl_GenericAttribute)& theGA)
 {
   _isLocal = true;
diff --git a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx
index 0310c4c17..3be0736cd 100644
--- a/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_GenericAttribute_i.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "utilities.h"
 #include "SALOMEDS_GenericAttribute_i.hxx"
 #include "SALOMEDS_Attributes.hxx"
@@ -22,6 +22,8 @@ using namespace std;
 
 #include "OpUtil.hxx"
 
+using namespace std;
+
 UNEXPECT_CATCH(GALockProtection, SALOMEDS::GenericAttribute::LockProtection);
 
 SALOMEDS_GenericAttribute_i::SALOMEDS_GenericAttribute_i(const Handle(TDF_Attribute)& theImpl, CORBA::ORB_ptr theOrb)
diff --git a/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx b/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx
index d7c739be5..1a5232031 100644
--- a/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx
@@ -30,7 +30,7 @@
 #define __SALOMEDS_SATTRIBUTE_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>
diff --git a/src/SALOMEDS/SALOMEDS_SComponent.cxx b/src/SALOMEDS/SALOMEDS_SComponent.cxx
index 334f9355c..651483595 100644
--- a/src/SALOMEDS/SALOMEDS_SComponent.cxx
+++ b/src/SALOMEDS/SALOMEDS_SComponent.cxx
@@ -2,13 +2,15 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std; 
+
 
 #include "SALOMEDS_SComponent.hxx"
 #include "SALOMEDS_SComponent_i.hxx"
 #include <string> 
 #include <TCollection_AsciiString.hxx> 
 
+using namespace std; 
+
 SALOMEDS_SComponent::SALOMEDS_SComponent(SALOMEDS::SComponent_ptr theSComponent)
 :SALOMEDS_SObject(theSComponent) 
 {}
diff --git a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx
index e1cfac20d..fb709652a 100644
--- a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_SComponentIterator_i.hxx"
 #include "SALOMEDS.hxx"
 #include "SALOMEDSImpl_SComponent.hxx"
 
+using namespace std;
+
 //============================================================================
 /*! Function : constructor
  * 
diff --git a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx
index 8bea4d1de..4eb829e45 100644
--- a/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx
@@ -6,7 +6,7 @@
 #define __SALOMEDS_SCOMPONENTITERATOR_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>
diff --git a/src/SALOMEDS/SALOMEDS_SComponent_i.cxx b/src/SALOMEDS/SALOMEDS_SComponent_i.cxx
index 718864a0d..01f0b62e6 100644
--- a/src/SALOMEDS/SALOMEDS_SComponent_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_SComponent_i.cxx
@@ -2,12 +2,14 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_SComponent_i.hxx"
 #include "SALOMEDS.hxx"
 #include "utilities.h"
 #include <map>
 
+using namespace std;
+
 SALOMEDS::SComponent_ptr SALOMEDS_SComponent_i::New(const Handle(SALOMEDSImpl_SComponent)& theImpl, CORBA::ORB_ptr theORB)
 {
 /*
diff --git a/src/SALOMEDS/SALOMEDS_SComponent_i.hxx b/src/SALOMEDS/SALOMEDS_SComponent_i.hxx
index f0f0361f8..ff6d4d216 100644
--- a/src/SALOMEDS/SALOMEDS_SComponent_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_SComponent_i.hxx
@@ -6,7 +6,7 @@
 #define __SALOMEDS_SCOMPONENT_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>
diff --git a/src/SALOMEDS/SALOMEDS_SObject.cxx b/src/SALOMEDS/SALOMEDS_SObject.cxx
index ad8947241..ae188aac1 100644
--- a/src/SALOMEDS/SALOMEDS_SObject.cxx
+++ b/src/SALOMEDS/SALOMEDS_SObject.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;  
+
 
 #include <string>
 #include <TCollection_AsciiString.hxx> 
@@ -28,6 +28,8 @@ using namespace std;
 
 #include "OpUtil.hxx"
 
+using namespace std;  
+
 SALOMEDS_SObject::SALOMEDS_SObject(SALOMEDS::SObject_ptr theSObject)
 {
 #ifdef WIN32
diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.cxx b/src/SALOMEDS/SALOMEDS_SObject_i.cxx
index d3df946d8..f7aa6b736 100644
--- a/src/SALOMEDS/SALOMEDS_SObject_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_SObject_i.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 
 #include "utilities.h"
 #include "SALOMEDS_SObject_i.hxx"
@@ -30,6 +30,8 @@ using namespace std;
 
 #include "OpUtil.hxx"
 
+using namespace std;
+
 SALOMEDS::SObject_ptr SALOMEDS_SObject_i::New(const Handle(SALOMEDSImpl_SObject)& theImpl, CORBA::ORB_ptr theORB)
 {
   SALOMEDS_SObject_i* so_servant = new SALOMEDS_SObject_i(theImpl, theORB);
diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.hxx b/src/SALOMEDS/SALOMEDS_SObject_i.hxx
index 81ddcc1f2..c4c0af6bf 100644
--- a/src/SALOMEDS/SALOMEDS_SObject_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_SObject_i.hxx
@@ -6,7 +6,7 @@
 #define __SALOMEDS_SOBJECT_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>
diff --git a/src/SALOMEDS/SALOMEDS_Study.cxx b/src/SALOMEDS/SALOMEDS_Study.cxx
index 7cb18ef75..1cd52e955 100644
--- a/src/SALOMEDS/SALOMEDS_Study.cxx
+++ b/src/SALOMEDS/SALOMEDS_Study.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std; 
+
 
 #include "utilities.h" 
 
@@ -41,6 +41,8 @@ using namespace std;
 
 #include "OpUtil.hxx"
 
+using namespace std; 
+
 SALOMEDS_Study::SALOMEDS_Study(const Handle(SALOMEDSImpl_Study)& theStudy)
 {
   _isLocal = true;
diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
index 08f81403b..df622bb97 100644
--- a/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
+++ b/src/SALOMEDS/SALOMEDS_StudyBuilder.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std; 
+
 
 #include "utilities.h"
 
@@ -23,6 +23,8 @@ using namespace std;
 #include "Utils_ORB_INIT.hxx" 
 #include "Utils_SINGLETON.hxx" 
 
+using namespace std; 
+
 SALOMEDS_StudyBuilder::SALOMEDS_StudyBuilder(const Handle(SALOMEDSImpl_StudyBuilder)& theBuilder)
 {
   _isLocal = true;
diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
index 5c2c74274..007274fd4 100644
--- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.cxx
@@ -2,7 +2,7 @@
 //  Author : Seregy RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "utilities.h"
 #include "SALOMEDS_StudyBuilder_i.hxx"
 #include "SALOMEDS_Study_i.hxx"
@@ -22,6 +22,8 @@ using namespace std;
 #include <TDF_Attribute.hxx>
 #include <stdlib.h> 
 
+using namespace std;
+
 UNEXPECT_CATCH(SBSalomeException, SALOME::SALOME_Exception);
 UNEXPECT_CATCH(SBLockProtection, SALOMEDS::StudyBuilder::LockProtection);
 
diff --git a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx
index 07c887e8f..77a24578b 100644
--- a/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx
@@ -6,7 +6,7 @@
 #define __SALOMEDS_STUDYBUILDER_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>
diff --git a/src/SALOMEDS/SALOMEDS_StudyManager.cxx b/src/SALOMEDS/SALOMEDS_StudyManager.cxx
index d55eeb809..2338d1fb8 100644
--- a/src/SALOMEDS/SALOMEDS_StudyManager.cxx
+++ b/src/SALOMEDS/SALOMEDS_StudyManager.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std; 
+
 #include "SALOMEDS_StudyManager.hxx"
 
 #include "SALOMEDSImpl_Study.hxx"
@@ -26,6 +26,8 @@ using namespace std;
 
 #include "OpUtil.hxx"
 
+using namespace std; 
+
 SALOMEDS_Driver_i* GetDriver(const Handle(SALOMEDSImpl_SObject)& theObject, CORBA::ORB_ptr orb);
 
 SALOMEDS_StudyManager::SALOMEDS_StudyManager(SALOMEDS::StudyManager_ptr theManager)
diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx
index 86db79708..aae2ebfd4 100644
--- a/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx
@@ -6,7 +6,7 @@
 #define __SALOMEDS_STUDYMANAGER_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>
@@ -15,7 +15,6 @@
 // Naming Service header
 #include "SALOME_NamingService.hxx"
 
-#include <iostream.h>
 #include <stdlib.h>
 
 //Standard not implemented
diff --git a/src/SALOMEDS/SALOMEDS_Study_i.cxx b/src/SALOMEDS/SALOMEDS_Study_i.cxx
index 60f8423a8..0306c28c0 100644
--- a/src/SALOMEDS/SALOMEDS_Study_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_Study_i.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "utilities.h"
 #include "SALOMEDS_Study_i.hxx"
 #include "SALOMEDS_UseCaseIterator_i.hxx"
@@ -36,6 +36,8 @@ using namespace std;
 
 #include "OpUtil.hxx"
 
+using namespace std;
+
 //============================================================================
 /*! Function : SALOMEDS_Study_i
  *  Purpose  : SALOMEDS_Study_i constructor
@@ -660,7 +662,11 @@ void SALOMEDS_Study_i::AddCreatedPostponed(const char* theIOR)
  *  Purpose  : 
  */
 //============================================================================
+#ifndef WNT
 void SALOMEDS_Study_i::RemovePostponed(const CORBA::Long theUndoLimit) 
+#else
+void SALOMEDS_Study_i::RemovePostponed(CORBA::Long theUndoLimit) 
+#endif
 {  
   SALOMEDS::Locker lock; 
 
@@ -668,14 +674,12 @@ void SALOMEDS_Study_i::RemovePostponed(const CORBA::Long theUndoLimit)
   int aLegth = aSeq->Length();
   for(int i = 1; i <= aLegth; i++) {
     TCollection_AsciiString anIOR = aSeq->Value(i);
-    //mkr : fix for bug IPAL9408 : check the length of anIOR
-    //                             before take value from it
-    if ( !anIOR.IsEmpty() && anIOR.Value(1) == 'c') {
+    if (anIOR.Value(1) == 'c') {
       CORBA::Object_var obj = _orb->string_to_object(anIOR.Split(1).ToCString());
       SALOME::GenericObj_var aGeneric = SALOME::GenericObj::_narrow(obj);
       if (!CORBA::is_nil(aGeneric)) aGeneric->Destroy();
     }
-    else if ( !anIOR.IsEmpty() && anIOR.Value(1) == 'd') {
+    else if (anIOR.Value(1) == 'd') {
       CORBA::Object_var obj = _orb->string_to_object(anIOR.Split(1).ToCString());
       SALOME::GenericObj_var aGeneric = SALOME::GenericObj::_narrow(obj);
       if (!CORBA::is_nil(aGeneric)) aGeneric->Destroy();
@@ -695,7 +699,11 @@ void SALOMEDS_Study_i::RemovePostponed(const CORBA::Long theUndoLimit)
  *  Purpose  : 
  */
 //============================================================================
+#ifndef WNT
 void SALOMEDS_Study_i::UndoPostponed(const CORBA::Long theWay) 
+#else
+void SALOMEDS_Study_i::UndoPostponed(CORBA::Long theWay) 
+#endif
 {
   SALOMEDS::Locker lock; 
 
diff --git a/src/SALOMEDS/SALOMEDS_Study_i.hxx b/src/SALOMEDS/SALOMEDS_Study_i.hxx
index d559ca852..bd94b6bf8 100644
--- a/src/SALOMEDS/SALOMEDS_Study_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_Study_i.hxx
@@ -6,7 +6,7 @@
 #define __SALOMEDS_STUDY_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>
@@ -248,10 +248,17 @@ public:
 
   virtual void AddCreatedPostponed(const char* theIOR);
 
+#ifndef WNT
   virtual void RemovePostponed(const CORBA::Long theUndoLimit); // removes postponed IORs of old transaction
                                                         // if theUndoLimit==0, removes all
   virtual void UndoPostponed(const CORBA::Long theWay); // theWay = 1: resurrect objects,
                                                 // theWay = -1: get back to the list of postponed
+#else
+  virtual void RemovePostponed(CORBA::Long theUndoLimit); // removes postponed IORs of old transaction
+                                                        // if theUndoLimit==0, removes all
+  virtual void UndoPostponed(CORBA::Long theWay); // theWay = 1: resurrect objects,
+                                                // theWay = -1: get back to the list of postponed
+#endif
 
   virtual CORBA::Boolean DumpStudy(const char* thePath, const char* theBaseName, CORBA::Boolean isPublished); 
 
diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder.cxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder.cxx
index 47e37fc0e..b31f5c402 100644
--- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder.cxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std; 
+
 
 #include "SALOMEDS_UseCaseBuilder.hxx"
 
@@ -13,6 +13,8 @@ using namespace std;
 #include <TCollection_AsciiString.hxx> 
 #include <string>
 
+using namespace std; 
+
 SALOMEDS_UseCaseBuilder::SALOMEDS_UseCaseBuilder(const Handle(SALOMEDSImpl_UseCaseBuilder)& theBuilder)
 {
   _isLocal = true;
diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx
index dd61e3d46..543b81304 100644
--- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.cxx
@@ -2,7 +2,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std;
+
 #include "SALOMEDS_UseCaseBuilder_i.hxx"
 #include "SALOMEDS_UseCaseIterator_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"  
@@ -10,6 +10,8 @@ using namespace std;
 
 #include "utilities.h"
 
+using namespace std;
+
 //============================================================================
 /*! Function : constructor
  *  Purpose  :
diff --git a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx
index f9cea5bb8..6b2ab147e 100644
--- a/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx
@@ -6,7 +6,7 @@
 #define __SALOMEDS_USECaseBuilder_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>
diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator.cxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator.cxx
index a027f6c18..36bbb0cf3 100644
--- a/src/SALOMEDS/SALOMEDS_UseCaseIterator.cxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator.cxx
@@ -2,11 +2,13 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-using namespace std; 
+
 
 #include "SALOMEDS_UseCaseIterator.hxx"
 #include "SALOMEDS_SObject.hxx"
 
+using namespace std; 
+
 SALOMEDS_UseCaseIterator::SALOMEDS_UseCaseIterator(const Handle(SALOMEDSImpl_UseCaseIterator)& theIterator)
 {
   _isLocal = true;
diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx
index 9af1467a3..4a89352ce 100644
--- a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.cxx
@@ -2,12 +2,14 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
+
 #include "SALOMEDS_UseCaseIterator_i.hxx"
 #include "SALOMEDS_SObject_i.hxx"
 #include "SALOMEDS.hxx"
 
 #include "SALOMEDSImpl_SObject.hxx"
 #include "utilities.h"
+
 using namespace std;
 
 //============================================================================
diff --git a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx
index 132db2ac0..94ccf379d 100644
--- a/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx
@@ -6,7 +6,7 @@
 #define __SALOMEDS_USECASEITERATOR_I_H__
 
 // std C++ headers
-#include <iostream.h>
+#include <iostream>
 
 // IDL headers
 #include <SALOMEconfig.h>