X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2Fpadder%2Fmeshjob%2Fimpl%2FSPADDERPluginTester_i.cxx;h=10b5b94c86575930175ac602b2969033f1aaae46;hb=d1bb1f5d44a2566316419a238a615bc4a69e7028;hp=83565540c93b3f42a2fef05332b052f911f41b61;hpb=dfe28da84ce7f3027980104b5dc356a1f5e83e6d;p=modules%2Fsmesh.git diff --git a/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx b/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx index 83565540c..10b5b94c8 100644 --- a/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx +++ b/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2011-2013 EDF R&D +// Copyright (C) 2011-2016 EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -100,7 +100,7 @@ bool SPADDERPluginTester_i::testkernel() beginService("SPADDERPluginTester_i::testplugin"); Engines::SalomeLauncher_ptr salomeLauncher = KERNEL::getSalomeLauncher(); - salomeLauncher = NULL; + if ( salomeLauncher ) salomeLauncher = NULL; endService("SPADDERPluginTester_i::testplugin"); return true; @@ -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);