CCAR: few minor corrections + compatibility with omniORB 4.0.6 (_pd_refCount

instead of pd_refCount)

diff --git a/src/Container/Component_i.cxx b/src/Container/Component_i.cxx
index 934019a98c84579e229ea00b2fea5458bfd14ca6..8c647e70044fe1066e3e2ec7d4a1abef86a7f79d 100644 (file)
--- 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 9cd47d4004b6b89c12c11ac9ed776cd44cfc4967..4d3ff13a01d925e40db7cdabc93765b425564835 100755 (executable)
--- 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 5bfef04fe7dcfd83d21fffaf6bc173c6aea92f92..75d05ccb8eb91bc8f575ff674a6f871261d0c213 100755 (executable)
--- 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 61351cfec14da62817f2f780002b1218ccab81a0..49a6c00888bad76fc9499105ea7b8b3e59a0e13b 100644 (file)
--- 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 28f8a0ff213d61696f06fa70a062b99cd1573e3d..99c152a940871eb9e2f8ebd553ae782218a66a98 100644 (file)
--- 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 7ce182f86c4ea5ba49cecf84887ce057eb4d0fb3..743fc22c68f6ff3f3ebfb24d88a2eda2ecee924f 100755 (executable)
--- 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 cb37b782878f7600308ec7f3d8e68f9a47c13fae..221f60d665031bcfdf55e05586c800976d62a161 100644 (file)
--- 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);
 }