From ad3b3a2bbf307b43f9bd027673dd8d1eccf86b50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=A9rald=20NICOLAS?= Date: Wed, 20 May 2020 18:06:11 +0200 Subject: [PATCH] Version et engine --- src/ADAPT_I/HOMARD_Gen_i.cxx | 10 +++++----- src/ADAPT_I/HOMARD_i.hxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ADAPT_I/HOMARD_Gen_i.cxx b/src/ADAPT_I/HOMARD_Gen_i.cxx index dde42a691..35cca098a 100644 --- a/src/ADAPT_I/HOMARD_Gen_i.cxx +++ b/src/ADAPT_I/HOMARD_Gen_i.cxx @@ -32,7 +32,7 @@ #include "FrontTrack.hxx" -#include "HOMARD_version.h" +#include "SMESH_version.h" #include "utilities.h" #include "Basics_Utils.hxx" @@ -5174,9 +5174,9 @@ void SALOMEException( std::string message ) char* HOMARD_Gen_i::getVersion() { #if HOMARD_DEVELOPMENT - return CORBA::string_dup(HOMARD_VERSION_STR"dev"); + return CORBA::string_dup(SMESH_VERSION_STR"dev"); #else - return CORBA::string_dup(HOMARD_VERSION_STR); + return CORBA::string_dup(SMESH_VERSION_STR); #endif } //=============================================================================== @@ -5419,13 +5419,13 @@ CORBA::Long HOMARD_Gen_i::GetYACSConvergenceType() extern "C" { HOMARDENGINE_EXPORT - PortableServer::ObjectId* HOMARDEngine_factory(CORBA::ORB_ptr orb, + PortableServer::ObjectId* ADAPTEngine_factory(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, PortableServer::ObjectId* contId, const char* instanceName, const char* interfaceName) { - MESSAGE("PortableServer::ObjectId* HOMARDEngine_factory()"); + MESSAGE("PortableServer::ObjectId* ADAPTEngine_factory()"); HOMARD_Gen_i* myHOMARD_Gen = new HOMARD_Gen_i(orb, poa, contId, instanceName, interfaceName); return myHOMARD_Gen->getId(); } diff --git a/src/ADAPT_I/HOMARD_i.hxx b/src/ADAPT_I/HOMARD_i.hxx index 2f6aad6bd..359e33143 100644 --- a/src/ADAPT_I/HOMARD_i.hxx +++ b/src/ADAPT_I/HOMARD_i.hxx @@ -21,7 +21,7 @@ #define _HOMARD_I_HXX_ #ifdef WIN32 - #if defined HOMARDENGINE_EXPORTS || defined HOMARDEngine_EXPORTS + #if defined HOMARDENGINE_EXPORTS || defined ADAPTEngine_EXPORTS #define HOMARDENGINE_EXPORT __declspec( dllexport ) #else #define HOMARDENGINE_EXPORT __declspec( dllimport ) -- 2.39.2