Updated SALOME Kernel sources for building under Ms Visual .NET on Windows platform.

diff --git a/src/SALOMEDS/SALOMEDS_AttributePythonObject.hxx b/src/SALOMEDS/SALOMEDS_AttributePythonObject.hxx
index 58a9554d3be72be9d8fe3278ebf7cd011b670dbb..9f2ecae6fcce9e5b9d0306e26f78dec06740cff8 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributePythonObject.hxx
+++ b/src/SALOMEDS/SALOMEDS_AttributePythonObject.hxx
@@ -33,11 +33,6 @@
 #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_SObject.cxx b/src/SALOMEDS/SALOMEDS_SObject.cxx
index 233c5fca805dfd5d790d5418ff401ff459a4dec8..851ae8f6f53f2b6a2facb7b3051f2959c14e9366 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_SObject.cxx
+++ b/src/SALOMEDS/SALOMEDS_SObject.cxx
@@ -21,8 +21,6 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-
-
 #include <string>
 #include <TCollection_AsciiString.hxx> 
 #include <TColStd_HSequenceOfTransient.hxx>

diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.hxx b/src/SALOMEDS/SALOMEDS_SObject_i.hxx
index 4a04250d53a2bc48af8a8046e260ffe497298d09..05b725dd17faca483b1ba82a63e47b75a8295596 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_SObject_i.hxx
+++ b/src/SALOMEDS/SALOMEDS_SObject_i.hxx
@@ -35,10 +35,6 @@
 // Cascade headers
 #include "SALOMEDSImpl_SObject.hxx"
 
-#ifdef GetObject
-#undef GetObject
-#endif
-
 class Standard_EXPORT SALOMEDS_SObject_i: public virtual POA_SALOMEDS::SObject,
                          public virtual PortableServer::RefCountServantBase,
                          public virtual SALOME::GenericObj_i