From 3bb4e85176815932ad698811a84a97736cd0235e Mon Sep 17 00:00:00 2001 From: caremoli Date: Thu, 5 Apr 2007 16:48:24 +0000 Subject: [PATCH] CCAR: few minor corrections + compatibility with omniORB 4.0.6 (_pd_refCount instead of pd_refCount) --- src/Container/Component_i.cxx | 4 ++-- src/Container/SALOME_Container.hxx | 3 ++- src/ModuleCatalog/SALOME_ModuleCatalog.hxx | 3 ++- src/NamingService/SALOME_NamingService.cxx | 11 +++++------ src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx | 2 +- src/SALOMELocalTrace/SALOME_LocalTrace.hxx | 3 ++- src/TestContainer/SALOME_TestComponent_i.cxx | 8 ++++++-- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/Container/Component_i.cxx b/src/Container/Component_i.cxx index 934019a98..8c647e700 100644 --- a/src/Container/Component_i.cxx +++ b/src/Container/Component_i.cxx @@ -73,7 +73,7 @@ Engines_Component_i::Engines_Component_i() * Standard Constructor for generic Component, used in derived class * Connection to Registry and Notification * \param orb Object Request broker given by Container - * \parap poa Portable Object Adapter from Container (normally root_poa) + * \param poa Portable Object Adapter from Container (normally root_poa) * \param contId container CORBA id inside the server * \param instanceName unique instance name for this object (see Container_i) * \param interfaceName component class name @@ -117,7 +117,7 @@ Engines_Component_i::Engines_Component_i(CORBA::ORB_ptr orb, * Standard constructor for parallel component * Connection Notification (no connection to Registry !) * \param orb Object Request broker given by Container - * \parap poa Portable Object Adapter from Container (normally root_poa) + * \param poa Portable Object Adapter from Container (normally root_poa) * \param contId container CORBA id inside the server * \param instanceName unique instance name for this object (see Container_i) * \param interfaceName component class name diff --git a/src/Container/SALOME_Container.hxx b/src/Container/SALOME_Container.hxx index 9cd47d400..4d3ff13a0 100755 --- a/src/Container/SALOME_Container.hxx +++ b/src/Container/SALOME_Container.hxx @@ -44,4 +44,5 @@ #define CONTAINER_EXPORT #endif -#endif \ No newline at end of file +#endif + diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog.hxx index 5bfef04fe..75d05ccb8 100755 --- a/src/ModuleCatalog/SALOME_ModuleCatalog.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog.hxx @@ -44,4 +44,5 @@ #define MODULECATALOG_EXPORT #endif -#endif \ No newline at end of file +#endif + diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx index 61351cfec..49a6c0088 100644 --- a/src/NamingService/SALOME_NamingService.cxx +++ b/src/NamingService/SALOME_NamingService.cxx @@ -486,9 +486,9 @@ CORBA::Object_ptr SALOME_NamingService::ResolveFirst(const char* Path) * number of processors. * If the NamingService is out, the exception ServiceUnreachable is thrown. * \param hostname name of the machine on which the component is searched. - * \param containername name of the container in which the component is + * \param containerName name of the container in which the component is instanciated. - * \param componentname name of the component we are looking for an existing + * \param componentName name of the component we are looking for an existing instance. * \param nbproc in case of multi processor machine, container name is * suffixed with _nbproc. @@ -639,9 +639,8 @@ SALOME_NamingService::ContainerName(const Engines::MachineParameters& params) * Build a string representing the absolute pathname of a container in * SALOME_NamingService. This form gives a suffixed containerName in case of * multi processor machine. - * \param params struct from which we get container name (may be - * empty), number of nodes and number of processor - * per node. + * \param containerName name of the container in which the component is + instanciated. * \param hostname name of the host of the container, without domain names. * \return the path under the form /Containers/hostname/containerName * \sa ContainerName(const Engines::MachineParameters& params) @@ -1674,7 +1673,7 @@ void SALOME_NamingService::_Find(const char* name, * \param splitPath * \param lengthResult * \param contextToFind - * \param _notFound + * \param notFound */ // ============================================================================ diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx index 28f8a0ff2..99c152a94 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx @@ -1652,4 +1652,4 @@ void SALOMEDSImpl_Study::EnableUseCaseAutoFilling(bool isEnabled) _builder->SetOnAddSObject(NULL); _builder->SetOnRemoveSObject(NULL); } -} \ No newline at end of file +} diff --git a/src/SALOMELocalTrace/SALOME_LocalTrace.hxx b/src/SALOMELocalTrace/SALOME_LocalTrace.hxx index 7ce182f86..743fc22c6 100755 --- a/src/SALOMELocalTrace/SALOME_LocalTrace.hxx +++ b/src/SALOMELocalTrace/SALOME_LocalTrace.hxx @@ -44,4 +44,5 @@ #define SALOMELOCALTRACE_EXPORT #endif -#endif \ No newline at end of file +#endif + diff --git a/src/TestContainer/SALOME_TestComponent_i.cxx b/src/TestContainer/SALOME_TestComponent_i.cxx index cb37b7828..221f60d66 100644 --- a/src/TestContainer/SALOME_TestComponent_i.cxx +++ b/src/TestContainer/SALOME_TestComponent_i.cxx @@ -46,7 +46,9 @@ Engines_TestComponent_i::Engines_TestComponent_i(CORBA::ORB_ptr orb, MESSAGE("activate object"); _thisObj = this ; _id = _poa->activate_object(_thisObj); - SCRUTE(_pd_refCount); + //does not work with 4.0.6 (too bad) + //SCRUTE(_pd_refCount); + //SCRUTE(_refcount_value()); } Engines_TestComponent_i::Engines_TestComponent_i() @@ -62,7 +64,9 @@ char* Engines_TestComponent_i::Coucou(CORBA::Long L) { char s[100]; sprintf(s, "TestComponent_i : L = %ld", (long) L); - SCRUTE(_pd_refCount); + //does not work with 4.0.6 (too bad) + //SCRUTE(_pd_refCount); + //SCRUTE(_refcount_value()); return CORBA::string_dup(s); } -- 2.39.2