From 05e998a648eb78d8bb9db26ae7e2add394c859bf Mon Sep 17 00:00:00 2001 From: abn Date: Mon, 12 Oct 2015 17:14:36 +0200 Subject: [PATCH] More on CORBA servants. --- doc/user/doxygen/Doxyfile_med_user.in | 5 ++++- .../doxfiles/reference/distrib/corba-distrib.dox | 14 ++++++++++---- doc/user/doxygen/fakesources/namespaces.C | 2 +- src/MEDLoader/MEDFileField.cxx | 2 ++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/doc/user/doxygen/Doxyfile_med_user.in b/doc/user/doxygen/Doxyfile_med_user.in index 3d29d1b9c..6c4cc970d 100644 --- a/doc/user/doxygen/Doxyfile_med_user.in +++ b/doc/user/doxygen/Doxyfile_med_user.in @@ -95,7 +95,8 @@ INPUT = @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/index.dox \ @PROJECT_SOURCE_DIR@/src/INTERP_KERNEL/Bases \ @PROJECT_SOURCE_DIR@/src/INTERP_KERNEL/Geometric2D \ @PROJECT_SOURCE_DIR@/src/MEDCoupling \ - @PROJECT_SOURCE_DIR@/src/MEDLoader + @PROJECT_SOURCE_DIR@/src/MEDLoader \ + @PROJECT_SOURCE_DIR@/src/MEDCouplingCorba FILE_PATTERNS = InterpKernelDEC.* \ OverlapDEC.* \ @@ -107,6 +108,7 @@ FILE_PATTERNS = InterpKernelDEC.* \ ExplicitCoincidentDEC.* \ NonCoincidentDEC.* \ CommInterface.* \ + ICoCo*.* \ NormalizedGeometricTypes \ NormalizedUnstructuredMesh.* \ Interpolation2D.* \ @@ -155,6 +157,7 @@ FILE_PATTERNS = InterpKernelDEC.* \ MEDFileParameter.* \ MEDFileMesh.* \ MEDFileField.* \ + *Servant.* \ *.dox RECURSIVE = YES EXCLUDE = CVS diff --git a/doc/user/doxygen/doxfiles/reference/distrib/corba-distrib.dox b/doc/user/doxygen/doxfiles/reference/distrib/corba-distrib.dox index d2534d95c..59ed64c2e 100644 --- a/doc/user/doxygen/doxfiles/reference/distrib/corba-distrib.dox +++ b/doc/user/doxygen/doxfiles/reference/distrib/corba-distrib.dox @@ -1,10 +1,16 @@ /*! \page corba-distrib Distribution in MEDCoupling using CORBA -The following classes allow to publish MEDCoupling objects on the CORBA bus: +The following classes allow to publish \ref medcoupling "MEDCoupling objects" on the CORBA bus. They are +directly related to the equivalent class in MEDCoupling, without the string \c Servant at the end of the +name: -- MEDCouplingUMeshServant -- MEDCouplingCMeshServant - +- \ref ParaMEDMEM::DataArrayDoubleServant "DataArrayDoubleServant" +- \ref ParaMEDMEM::DataArrayIntServant "DataArrayIntServant" +- \ref ParaMEDMEM::MEDCouplingUMeshServant "MEDCouplingUMeshServant" +- \ref ParaMEDMEM::MEDCouplingCMeshServant "MEDCouplingCMeshServant" +- \ref ParaMEDMEM::MEDCouplingFieldDoubleServant "MEDCouplingFieldDoubleServant" + + TODO: complete the list. */ \ No newline at end of file diff --git a/doc/user/doxygen/fakesources/namespaces.C b/doc/user/doxygen/fakesources/namespaces.C index cacf1708f..d14e85718 100644 --- a/doc/user/doxygen/fakesources/namespaces.C +++ b/doc/user/doxygen/fakesources/namespaces.C @@ -18,7 +18,7 @@ // // This file contains code used only for -// generation of documentation. +// generation of documentation. Not working? /*! * \namespace INTERP_KERNEL diff --git a/src/MEDLoader/MEDFileField.cxx b/src/MEDLoader/MEDFileField.cxx index c965f8c1c..932e70028 100644 --- a/src/MEDLoader/MEDFileField.cxx +++ b/src/MEDLoader/MEDFileField.cxx @@ -2942,6 +2942,7 @@ const MEDFileFieldLoc& MEDFileFieldGlobs::getLocalizationFromId(int locId) const return *_locs[locId]; } +/// @cond INTERNAL namespace ParaMEDMEMImpl { class LocFinder @@ -2962,6 +2963,7 @@ namespace ParaMEDMEMImpl const std::string& _pfl; }; } +/// @endcond int MEDFileFieldGlobs::getLocalizationId(const std::string& loc) const { -- 2.39.2