Windows compatibility.

This commit is contained in:
rnv 2017-03-31 10:11:44 +03:00
parent e2ed82ab76
commit d1bb1f5d44
2 changed files with 17 additions and 6 deletions

View File

@ -146,11 +146,12 @@ bool SPADDERPluginTester_i::testsmesh(CORBA::Long studyId)
// //
extern "C" extern "C"
{ {
PortableServer::ObjectId * SPADDERPluginTesterEngine_factory( CORBA::ORB_ptr orb, SPADDERPLUGINTESTERENGINE_EXPORT PortableServer::ObjectId *
PortableServer::POA_ptr poa, SPADDERPluginTesterEngine_factory( CORBA::ORB_ptr orb,
PortableServer::ObjectId * contId, PortableServer::POA_ptr poa,
const char *instanceName, PortableServer::ObjectId * contId,
const char *interfaceName) const char *instanceName,
const char *interfaceName)
{ {
MESSAGE("PortableServer::ObjectId * SPADDERPluginTesterEngine_factory()"); MESSAGE("PortableServer::ObjectId * SPADDERPluginTesterEngine_factory()");
SPADDERPluginTester_i * myEngine = new SPADDERPluginTester_i(orb, poa, contId, instanceName, interfaceName); SPADDERPluginTester_i * myEngine = new SPADDERPluginTester_i(orb, poa, contId, instanceName, interfaceName);

View File

@ -22,13 +22,23 @@
#ifndef _SPADDER_PLUGINTESTER_HXX_ #ifndef _SPADDER_PLUGINTESTER_HXX_
#define _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 the stubs generating from SPADDERPluginTest.idl
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SPADDERPluginTest) #include CORBA_SERVER_HEADER(SPADDERPluginTest)
#include <SALOME_Component.hh> #include <SALOME_Component.hh>
#include "SALOME_Component_i.hxx" #include "SALOME_Component_i.hxx"
class SPADDERPluginTester_i: class SPADDERPLUGINTESTERENGINE_EXPORT SPADDERPluginTester_i:
public virtual POA_SPADDERPluginTest::SPADDERPluginTester, public virtual POA_SPADDERPluginTest::SPADDERPluginTester,
public Engines_Component_i public Engines_Component_i
{ {