Version et engine

diff --git a/src/ADAPT_I/HOMARD_Gen_i.cxx b/src/ADAPT_I/HOMARD_Gen_i.cxx
index dde42a69114992bc9c061c8e5bf65d8d0ccff431..35cca098a09f6c8104ee19bce913ed4c9163921a 100644 (file)
--- 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 2f6aad6bdf7eba0e02073440fee63cb560008e91..359e3314352a77e8b5c9e61629276a4429f9e4e0 100644 (file)
--- 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 )