diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-07-15 09:34:33 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-07-15 09:34:33 +0000 |
| commit | 55f6abbb20b1f8c4598f2d4ed426b0f30ffa94e0 (patch) | |
| tree | ede2382c11430d0ca5bd3b9bcb645ea39c2dea4e | |
| parent | afd805196bb869f0ca87887971840cccdee0a125 (diff) | |
| download | ATCD-55f6abbb20b1f8c4598f2d4ed426b0f30ffa94e0.tar.gz | |
Thu Jul 15 09:34:43 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* DAnCE/LocalityManager/Interceptors/Standard_Error.h:
Doxygen changes
* etc/ciao_DAnCE.doxygen:
Use INet tag file
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.h | 19 | ||||
| -rw-r--r-- | CIAO/etc/ciao_DAnCE.doxygen | 3 |
3 files changed, 19 insertions, 11 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 8ea19772c1b..26deb63544f 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Jul 15 09:34:43 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/LocalityManager/Interceptors/Standard_Error.h: + Doxygen changes + + * etc/ciao_DAnCE.doxygen: + Use INet tag file + Thu Jul 15 09:12:22 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/impl/ContentFilterSetting.h: diff --git a/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.h b/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.h index 8f402cb66f9..9f932c72572 100644 --- a/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.h +++ b/CIAO/DAnCE/LocalityManager/Interceptors/Standard_Error.h @@ -24,13 +24,12 @@ namespace DAnCE : public virtual DAnCE::DeploymentInterceptor_Base { public: - // Constructor - + /// Constructor Standard_Error (void); - - // Destructor + + /// Destructor virtual ~Standard_Error (void); - + virtual void instance_post_install (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instance_index, @@ -47,31 +46,31 @@ namespace DAnCE void instance_post_configured (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void instance_post_activate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void instance_post_passivate (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); - + virtual void instance_post_remove (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong instanceRef, const ::CORBA::Any & exception_thrown); virtual void configure(const Deployment::Properties&); - + private: }; } extern "C" { - ::DAnCE::DeploymentInterceptor_ptr + ::DAnCE::DeploymentInterceptor_ptr DAnCE_Error_Interceptors_Export create_DAnCE_Standard_Error (void); } diff --git a/CIAO/etc/ciao_DAnCE.doxygen b/CIAO/etc/ciao_DAnCE.doxygen index af81fbf9916..f77d0b2cece 100644 --- a/CIAO/etc/ciao_DAnCE.doxygen +++ b/CIAO/etc/ciao_DAnCE.doxygen @@ -142,7 +142,8 @@ TAGFILES = html/ace/ACE.tag=../../../ace \ html/acexml/ACEXML.tag=../../../acexml \ html/tao/rtportableserver/TAO_RTPortableServer.tag=../../rtportableserver \ html/tao/cosnaming/TAO_CosNaming.tag=../../cosnaming \ - html/tao/ifr/TAO_IFR.tag=../../ifr + html/tao/ifr/TAO_IFR.tag=../../ifr \ + html/ace/inet/ACE_INet.tag=../../../protocols/INet GENERATE_TAGFILE = html/tao/ciao/DAnCE.tag ALLEXTERNALS = NO PERL_PATH = /usr/bin/perl |