diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-08-16 10:32:29 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-08-16 10:32:29 +0000 |
| commit | 081b69b3e364ad37a108985a841dd5100f76282b (patch) | |
| tree | 96a3fa99a8fb6400d0319307743f1c20213547d4 /CIAO | |
| parent | f6b389ac0b87f7149592afc09a65bda6e87e3734 (diff) | |
| download | ATCD-081b69b3e364ad37a108985a841dd5100f76282b.tar.gz | |
Thu Aug 16 10:31:55 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/dds4ccm_impl.mpb:
Removed obsolete include path
* connectors/dds4ccm/impl/DomainParticipantManager.h:
Doxygen fix
Diffstat (limited to 'CIAO')
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/MPC/config/dds4ccm_impl.mpb | 3 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index be210fbfb6c..1412b9a50ca 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Aug 16 10:31:55 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * MPC/config/dds4ccm_impl.mpb: + Removed obsolete include path + + * connectors/dds4ccm/impl/DomainParticipantManager.h: + Doxygen fix + Thu Aug 16 10:30:43 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp: diff --git a/CIAO/MPC/config/dds4ccm_impl.mpb b/CIAO/MPC/config/dds4ccm_impl.mpb index 4598aaaf69c..5bda47395ab 100644 --- a/CIAO/MPC/config/dds4ccm_impl.mpb +++ b/CIAO/MPC/config/dds4ccm_impl.mpb @@ -5,8 +5,7 @@ feature(dds4ccm_opendds) : gen_ostream, dds4ccm_skel, dds4ccm_lem_stub, dds4ccm_ after += CIAO_DDS4CCM_DDS_Impl libs += CIAO_DDS4CCM_DDS_Impl includes += $(CIAO_ROOT)/connectors \ - $(CIAO_ROOT)/connectors/dds4ccm/idl \ - $(CIAO_ROOT)/connectors/dds4ccm/idl/OpenDDS + $(CIAO_ROOT)/connectors/dds4ccm/idl } feature(dds4ccm_ndds) : gen_ostream, dds4ccm_skel, dds4ccm_lem_stub, ndds_idltocpp_impl, ndds_idltocpp_lem_stub { diff --git a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h index c05d1dd752d..0a2cba616da 100644 --- a/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h +++ b/CIAO/connectors/dds4ccm/impl/DomainParticipantManager.h @@ -43,10 +43,7 @@ namespace CIAO friend class ACE_Singleton<DomainParticipantManager, TAO_SYNCH_MUTEX>; /** - * - * @class : DDSParticipantTopic - * - * @brief : + * @class DDSParticipantTopic * * Stores a list of topics for a specific domain. If * several connectors run in the same process and those |