ENV: Windows porting.

diff --git a/src/SALOMEDS/SALOMEDS.cxx b/src/SALOMEDS/SALOMEDS.cxx
index 1cebce2ed8a1927d9c20e99cae4c56d5cc5301b9..ae488ad0a7421c26faf12a33d44c5e809a4a9310 100644 (file)
--- 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 737ee2bf2b2c0a07a916fa381e2c0fe33ae36736..ee2d75a09054992d653f1bf015c4a3fd89c51ed0 100644 (file)
--- 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 675361f98cf9e9d9528830dea047788ac3150d71..4f68a4b83a9ef7afda03cc6de8fe06fa7ae98595 100644 (file)
--- 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 192a9ba8d10b1a710bc7ca352934ade68f6d3d01..5cff0d380f614cfdcff6ef966008be8db5c7c02f 100644 (file)
--- 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 9795c3342d8b4d1656c04c77ca2303b8f4cdfd73..d25c454f671acd2d21b2dc4d33dedf5f2defeaa3 100644 (file)
--- 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 84bdab1e9d86180261e5764785fda85522f05c63..c94f3b70de983a68d50c8bcd7553ec696060bca4 100644 (file)
--- 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 f26712d2a90d4e91f1f02e4cea520ff2477a20b0..9bbe0fd66134dc66c05c699a4e2e8ac9ead7feed 100644 (file)
--- 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 cc94d8d81f2d728fb00104de08c36b41a2a7d305..54eca3453cd89dc5a5f148d4e37c91f125ace485 100644 (file)
--- 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 292a5a901528f9a6a505bd44d9548f1a5d811cf8..24309b32ae58298a99d40672e82d7beaec0e0488 100644 (file)
--- 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 601956099a2c8d5f45ed01e6cf517a7dba29fbe0..1766ccf87d75004cd7d8fd903b13381e406840e2 100644 (file)
--- 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 23e4cf1528418902df1d859b21cb372e555582c4..79231218e01ea063a272183c0cb4e388f85617ab 100644 (file)
--- 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 5bb4cf13f3a68aeb356e5428cfae0c47c3b27623..65483a3a32d84b1412fbfeb66dd18033ae76e5d4 100644 (file)
--- 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 a1e77dc16838fd05d7109695c6094ccc85daeed0..0a7445dd6858bf9cf8b7785d46c5c84c64512f14 100644 (file)
--- 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 cabd447acd428f2a1be00807f6c5df2e72a305cc..1add1e193a1ba42e8386523882b263658b278b83 100644 (file)
--- 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 df6f837fdd869d36d222ff0075f7a15a11b109e5..9774a1004b4bda5ef69e7bcf694a5ab59ddb4a48 100644 (file)
--- 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 1247df4e7bb7ea87acf74d1bcffedc11772e68b7..e5f12b2dc92adea6d9cb9cf8ae705432b316de19 100644 (file)
--- 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 c8f4b886b8a8ef2b11b430afcda2bfddc48c710c..59dcf552ebaad9db5cb892dd5116ee67cc78f354 100644 (file)
--- 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 eb89f24dc3b0a58d9da8f3ce82a9f7188a09e070..a83c79c162d26b904910486de0e3423c5beae367 100644 (file)
--- 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 7e9b96798dc42f2d58cbbb654b98101d06bfef9d..0fccb55c0a86725f8235cd0c741f7ca3f94166e1 100644 (file)
--- 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 583721d411ee5adc346448a9c0e2d818168cd62e..bf97ab386ec4d65a1af7d642c8c7142304332d02 100644 (file)
--- 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 092c5a417b5061afba43ff382000a0f3611ef940..09bb75f942abf3d24b4a9d95a7ae39f0aa6f14dc 100644 (file)
--- 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 39c2af10b5809b7c0b939780a97c1e563adc2ba1..4bd080ecaf69fed69654358dd6e80be930228ef6 100644 (file)
--- 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 baa75a717b1d9597968bcbb28bf0e054cb07aa7b..774646de74dffd31a2e4c98e9c890db6edbd948f 100644 (file)
--- 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 d8adf45ba8db7cbfd843400b3aa03d70981e3f13..0c97e62467f8349f2fe9d4eb9e57e833a36ce2ef 100644 (file)
--- 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 6dee8f868186171bd8283134ae154bc7c4f027b9..0a9898a7e1db53b216e9e2d953cf7d1203adc228 100644 (file)
--- 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 7523eaed484aef9b833e388848d5dd1a3bbd63f7..573920cc6ad885cf0b6b4db9d807797ca11aafd6 100644 (file)
--- 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 07929e3fefb386d4113437a3e3c9538fba1162a1..98ff924ad9800bece9b12c8457912d0a21abab93 100644 (file)
--- 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 eafff6072024335d612060751642632ad67c0ed9..4b9d928d6ef74d98b0c81da7051af355a0e87e2c 100644 (file)
--- 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 edc95c0704b4236e2c59027a1c2ea00e982ad7da..8de0bd4c5a6657f71d3d9217f5249dd64acc9b9c 100644 (file)
--- 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 83a467215d9a2da77b60da0998fd44ae0767ee3d..22b6864c0d6f8863eaea698fd150f4e7643d1629 100644 (file)
--- 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 1e74b0e92790b846b09b82f5e17e0d022da08c44..632d63cfcebac544f90369e5aca6f1a1c3020191 100644 (file)
--- 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 78d9e3e991ebb7620e14d7288bc39e24cc54cec6..e9dd1d4bcc25379239816de0d4b32599875cb6e3 100644 (file)
--- 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 6f704fefdb7d368df230e3d864731fd1c7bb02b7..d57b0971c1129aecb1f2f7554ae23d497193259c 100644 (file)
--- 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 0b4ae30edd061f8d0c39ac2925bb5a59bd104440..e2baa207123ff7890f100c548753c1cb2ef70198 100644 (file)
--- 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 c41a25869ded3bfc8ed5b43b19aedeb5deba0f74..6522ef2424df077e5a903e61b15d1a1ba9a58b6e 100644 (file)
--- 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 2bf6755fbcb365b1796212e22bc70b62b779a0c8..c1c4e23c40cb113a50bf81c244aca541ea62b24e 100644 (file)
--- 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 0310c4c178cec2bd624b216314463434ffe7e78f..3be0736cd53527d7edb03b685a622f8eba8d5846 100644 (file)
--- 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 d7c739be5be95ba2b846f0ec131b8d2b13037ce7..1a5232031c98880627a568e668c10b74a10f0d65 100644 (file)
--- 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 334f9355cd23f00d0cf9034035fe542b69dec00c..651483595713752b57319dda163decd77e0eeaa4 100644 (file)
--- 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 e1cfac20db6499f91f1cb69621df8c0c9b69ecea..fb709652a380e2828a32f9a237196625030b13a4 100644 (file)
--- 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 8bea4d1dec51303b356ced796bf464a362509375..4eb829e45f698903fab038719c110d3481be5e09 100644 (file)
--- 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 718864a0d10f7407b438a64bf724157cfca81f55..01f0b62e689e990f1c96418070d85bcae5c634f3 100644 (file)
--- 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 f0f0361f88f810f03502f98bdc0969537619aae7..ff6d4d216e1bcc13302713976e8492347d9c06bd 100644 (file)
--- 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 ad89472412e07bdbfca0b48e896f3864935e0860..ae188aac1d16bf054e5979f13830c73207f3f940 100644 (file)
--- 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 d3df946d82dc0c3e10d481b94047850676938a2e..f7aa6b7368b360eb29e4c658193da4227a1f286f 100644 (file)
--- 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 81ddcc1f2fd492a5c4e181075307103b5329cd6e..c4c0af6bf55680fe25a07b4ea8bf9c11f61bb9cd 100644 (file)
--- 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 7cb18ef75f57b121bdafb54ee1aff2ba70b97f94..1cd52e9556ae6dc3cb6b1f79b1b8d21fd17a2008 100644 (file)
--- 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 08f81403bf9e7ebd9b1501cecd3fdf013d7cb38e..df622bb97f7fabcebfd1fc2dc18cd81f3cbeeaa7 100644 (file)
--- 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 5c2c742744f98ede247797ab15ddaf40fa4e61d2..007274fd4688f3cf30b2936aa2e5a261465847e5 100644 (file)
--- 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 07c887e8f46d85cb0a054ea3321e438111b298c9..77a24578b773114e5f38d27a9b4735da441cc808 100644 (file)
--- 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 d55eeb80987503d17e1530764d4452aea58da18c..2338d1fb821277da76b1378b33fd145df6363ac8 100644 (file)
--- 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 86db79708d28b7762e2bd210fa2b2015ada60469..aae2ebfd488c54b0ed333ae33db673adf270c38a 100644 (file)
--- 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 60f8423a89d09a5709f4cd4d8a450f00af8eded1..0306c28c0769866d9a7a011dd5bd8866e445402a 100644 (file)
--- 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 d559ca852a65caa9be189e83bbb67544f6e0ae64..bd94b6bf87e4001337e53bff17c439e7bc6c80aa 100644 (file)
--- 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 47e37fc0e7c482ed66a5aff98e7b3f100f41e808..b31f5c402d05a4acb0291c50e93262e13d74ff2c 100644 (file)
--- 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 dd61e3d46cad4a2d28e2730531c27f25b0ab88d0..543b81304ec4b05b55fa2cac8ff244e2746b7505 100644 (file)
--- 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 f9cea5bb8f2351a326378dc85df446083d8e44a2..6b2ab147e77450d4d9039379c6178416f04e98a7 100644 (file)
--- 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 a027f6c18f03fba3e211c9c082d7e3a7e362b84c..36bbb0cf3b1f0de1104b41c5f92f3c692ad66c53 100644 (file)
--- 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 9af1467a34b5f23cf0da4a26dc8d44a640136185..4a89352cee0ed6a94a0814575e70eae079158cc0 100644 (file)
--- 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 132db2ac0d540406fb57c8c565f7224cc9ca2bab..94ccf379dfa6d922c839af2f1a6bf5018ef45856 100644 (file)
--- 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>