From: stv Date: Mon, 20 Feb 2006 08:55:23 +0000 (+0000) Subject: Updated SALOME Kernel sources for building under Ms Visual .NET on Windows platform. X-Git-Tag: LAST_STABLE_VERSION_21_09_2006_ON_3_2_0~79 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9310cec3609823cdf69b1eef50b73f7d621f01d4;p=modules%2Fkernel.git 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 58a9554d3..9f2ecae6f 100644 --- 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 233c5fca8..851ae8f6f 100644 --- a/src/SALOMEDS/SALOMEDS_SObject.cxx +++ b/src/SALOMEDS/SALOMEDS_SObject.cxx @@ -21,8 +21,6 @@ // Author : Sergey RUIN // Module : SALOME - - #include #include #include diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.hxx b/src/SALOMEDS/SALOMEDS_SObject_i.hxx index 4a04250d5..05b725dd1 100644 --- 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