From d1bb1f5d44a2566316419a238a615bc4a69e7028 Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 31 Mar 2017 10:11:44 +0300 Subject: [PATCH] Windows compatibility. --- .../padder/meshjob/impl/SPADDERPluginTester_i.cxx | 11 ++++++----- .../padder/meshjob/impl/SPADDERPluginTester_i.hxx | 12 +++++++++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx b/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx index e1cd4e7d2..10b5b94c8 100644 --- a/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx +++ b/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx @@ -146,11 +146,12 @@ bool SPADDERPluginTester_i::testsmesh(CORBA::Long studyId) // extern "C" { - PortableServer::ObjectId * SPADDERPluginTesterEngine_factory( CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - PortableServer::ObjectId * contId, - const char *instanceName, - const char *interfaceName) + SPADDERPLUGINTESTERENGINE_EXPORT PortableServer::ObjectId * + SPADDERPluginTesterEngine_factory( CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName) { MESSAGE("PortableServer::ObjectId * SPADDERPluginTesterEngine_factory()"); SPADDERPluginTester_i * myEngine = new SPADDERPluginTester_i(orb, poa, contId, instanceName, interfaceName); diff --git a/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.hxx b/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.hxx index 36c7637fc..9a2193d55 100644 --- a/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.hxx +++ b/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.hxx @@ -22,13 +22,23 @@ #ifndef _SPADDER_PLUGINTESTER_HXX_ #define _SPADDER_PLUGINTESTER_HXX_ +#ifdef WIN32 + #if defined SPADDERPLUGINTESTERENGINE_EXPORTS || defined SPADDERPluginTesterEngine_EXPORTS + #define SPADDERPLUGINTESTERENGINE_EXPORT __declspec( dllexport ) + #else + #define SPADDERPLUGINTESTERENGINE_EXPORT __declspec( dllimport ) + #endif +#else + #define SPADDERPLUGINTESTERENGINE_EXPORT +#endif + // include the stubs generating from SPADDERPluginTest.idl #include #include CORBA_SERVER_HEADER(SPADDERPluginTest) #include #include "SALOME_Component_i.hxx" -class SPADDERPluginTester_i: +class SPADDERPLUGINTESTERENGINE_EXPORT SPADDERPluginTester_i: public virtual POA_SPADDERPluginTest::SPADDERPluginTester, public Engines_Component_i {