Thu Mar 4 07:51:20 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/idl/ccm_dds.idl:
          Renamed ifdef according to file name.

        * connectors/dds4ccm/impl/dds/:
        * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.h:
        * connectors/dds4ccm/impl/dds/Coherent_Changes_Guard.cpp:
        * connectors/dds4ccm/impl/dds/ContentFilteredTopic.h:
        * connectors/dds4ccm/impl/dds/ContentFilteredTopic.cpp:
        * connectors/dds4ccm/impl/dds/DDSCallbackStatusHandler.cpp:
        * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.h:
        * connectors/dds4ccm/impl/dds/DDS_Base_Connector_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.h:
        * connectors/dds4ccm/impl/dds/DDS_Event_Connector_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_Get_T.h:
        * connectors/dds4ccm/impl/dds/DDS_Get_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_Listen_T.h:
        * connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_Read_T.h:
        * connectors/dds4ccm/impl/dds/DDS_Read_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_StateListen_T.h:
        * connectors/dds4ccm/impl/dds/DDS_StateListen_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.h:
        * connectors/dds4ccm/impl/dds/DDS_State_Connector_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_TopicBase_Connector_T.h:
        * connectors/dds4ccm/impl/dds/DDS_Update_T.h:
        * connectors/dds4ccm/impl/dds/DDS_Update_T.cpp:
        * connectors/dds4ccm/impl/dds/DDS_Write_T.h:
        * connectors/dds4ccm/impl/dds/DDS_Write_T.cpp:
        * connectors/dds4ccm/impl/dds/DataListenerControl_T.h:
        * connectors/dds4ccm/impl/dds/DataReader.h:
        * connectors/dds4ccm/impl/dds/DataReader.cpp:
        * connectors/dds4ccm/impl/dds/DataReaderHandler_T.h:
        * connectors/dds4ccm/impl/dds/DataReaderHandler_T.cpp:
        * connectors/dds4ccm/impl/dds/DataReaderListener.cpp:
        * connectors/dds4ccm/impl/dds/DataReaderListener_T.h:
        * connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp:
        * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.h:
        * connectors/dds4ccm/impl/dds/DataReaderStateListener_T.cpp:
        * connectors/dds4ccm/impl/dds/DataWriter.h:
        * connectors/dds4ccm/impl/dds/DataWriter.cpp:
        * connectors/dds4ccm/impl/dds/DataWriterListener.h:
        * connectors/dds4ccm/impl/dds/DataWriterListener.cpp:
        * connectors/dds4ccm/impl/dds/DataWriterListener_T.h:
        * connectors/dds4ccm/impl/dds/DataWriterListener_T.cpp:
        * connectors/dds4ccm/impl/dds/DomainParticipant.h:
        * connectors/dds4ccm/impl/dds/DomainParticipant.cpp:
        * connectors/dds4ccm/impl/dds/DomainParticipantFactory.h:
        * connectors/dds4ccm/impl/dds/DomainParticipantFactory.cpp:
        * connectors/dds4ccm/impl/dds/DomainParticipantListener.cpp:
        * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.h:
        * connectors/dds4ccm/impl/dds/DomainParticipantListener_T.cpp:
        * connectors/dds4ccm/impl/dds/Getter_T.h:
        * connectors/dds4ccm/impl/dds/Getter_T.cpp:
        * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.h:
        * connectors/dds4ccm/impl/dds/InstanceHandleManager_T.cpp:
        * connectors/dds4ccm/impl/dds/PortStatusListener_T.h:
        * connectors/dds4ccm/impl/dds/PortStatusListener_T.cpp:
        * connectors/dds4ccm/impl/dds/Publisher.h:
        * connectors/dds4ccm/impl/dds/Publisher.cpp:
        * connectors/dds4ccm/impl/dds/PublisherListener.h:
        * connectors/dds4ccm/impl/dds/PublisherListener.cpp:
        * connectors/dds4ccm/impl/dds/PublisherListener_T.h:
        * connectors/dds4ccm/impl/dds/PublisherListener_T.cpp:
        * connectors/dds4ccm/impl/dds/QueryCondition.h:
        * connectors/dds4ccm/impl/dds/QueryCondition.cpp:
        * connectors/dds4ccm/impl/dds/ReadCondition.h:
        * connectors/dds4ccm/impl/dds/Reader_T.h:
        * connectors/dds4ccm/impl/dds/Reader_T.cpp:
        * connectors/dds4ccm/impl/dds/StateListenerControl_T.h:
        * connectors/dds4ccm/impl/dds/StatusCondition.h:
        * connectors/dds4ccm/impl/dds/Subscriber.h:
        * connectors/dds4ccm/impl/dds/Subscriber.cpp:
        * connectors/dds4ccm/impl/dds/SubscriberListener.h:
        * connectors/dds4ccm/impl/dds/SubscriberListener.cpp:
        * connectors/dds4ccm/impl/dds/SubscriberListener_T.h:
        * connectors/dds4ccm/impl/dds/SubscriberListener_T.cpp:
        * connectors/dds4ccm/impl/dds/Topic.h:
        * connectors/dds4ccm/impl/dds/Topic.cpp:
        * connectors/dds4ccm/impl/dds/TopicDescription.h:
        * connectors/dds4ccm/impl/dds/TopicListener.cpp:
        * connectors/dds4ccm/impl/dds/TopicListener_T.h:
        * connectors/dds4ccm/impl/dds/TopicListener_T.cpp:
        * connectors/dds4ccm/impl/dds/Updater_T.h:
        * connectors/dds4ccm/impl/dds/Updater_T.cpp:
        * connectors/dds4ccm/impl/dds/Writer_T.h:
        * connectors/dds4ccm/impl/dds/Writer_T.cpp:

        * connectors/dds4ccm/impl/dds/ndds:
        * connectors/dds4ccm/impl/dds/ndds/BuiltinTopicKey_t.h:
        * connectors/dds4ccm/impl/dds/ndds/DataReaderQos.h:
        * connectors/dds4ccm/impl/dds/ndds/DataWriterQos.h:
        * connectors/dds4ccm/impl/dds/ndds/DeadlineQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/DestinationOrderQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/DomainParticipantFactoryQos.h:
        * connectors/dds4ccm/impl/dds/ndds/DomainParticipantQos.h:
        * connectors/dds4ccm/impl/dds/ndds/DurabilityQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/DurabilityServiceQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/Duration_t.h:
        * connectors/dds4ccm/impl/dds/ndds/EntityFactoryQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/GroupDataQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/HistoryQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/InconsistentTopicStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/InstanceHandleSeq.h:
        * connectors/dds4ccm/impl/dds/ndds/InstanceHandle_t.h:
        * connectors/dds4ccm/impl/dds/ndds/LatencyBudgetQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/LifespanQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/LivelinessChangedStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/LivelinessLostStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/LivelinessQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/OctetSeq.h:
        * connectors/dds4ccm/impl/dds/ndds/OfferedDeadlineMissedStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/OfferedIncompatibleQosStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/OwnershipQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/OwnershipStrengthQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/PartitionQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/PresentationQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/PublicationBuiltinTopicData.h:
        * connectors/dds4ccm/impl/dds/ndds/PublicationMatchedStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/PublisherQos.h:
        * connectors/dds4ccm/impl/dds/ndds/QosPolicyCountSeq.h:
        * connectors/dds4ccm/impl/dds/ndds/ReaderDataLifecycleQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/ReliabilityQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/RequestedDeadlineMissedStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/RequestedIncompatibleQosStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/ResourceLimitsQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/SampleInfo.h:
        * connectors/dds4ccm/impl/dds/ndds/SampleLostStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/SampleRejectedStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/StringSeq.h:
        * connectors/dds4ccm/impl/dds/ndds/SubscriberQos.h:
        * connectors/dds4ccm/impl/dds/ndds/SubscriptionBuiltinTopicData.h:
        * connectors/dds4ccm/impl/dds/ndds/SubscriptionMatchedStatus.h:
        * connectors/dds4ccm/impl/dds/ndds/TimeBasedFilterQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/Time_t.h:
        * connectors/dds4ccm/impl/dds/ndds/TopicDataQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/TopicQos.h:
        * connectors/dds4ccm/impl/dds/ndds/TransportPriorityQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/UserDataQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds/WriterDataLifecycleQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ndds_impl.mpc:
        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp:
        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.h:
        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h:
        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp:
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp:
        * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp:
        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender_exec.cpp:
        * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp:
        * connectors/dds4ccm/impl/dds/BuiltinTopicKey_t.h:
        * connectors/dds4ccm/impl/dds/DataReaderQos.h:
        * connectors/dds4ccm/impl/dds/DataWriterQos.h:
        * connectors/dds4ccm/impl/dds/DeadlineQosPolicy.h:
        * connectors/dds4ccm/impl/dds/DestinationOrderQosPolicy.h:
        * connectors/dds4ccm/impl/dds/DomainParticipantFactoryQos.h:
        * connectors/dds4ccm/impl/dds/DomainParticipantQos.h:
        * connectors/dds4ccm/impl/dds/DurabilityQosPolicy.h:
        * connectors/dds4ccm/impl/dds/DurabilityServiceQosPolicy.h:
        * connectors/dds4ccm/impl/dds/Duration_t.h:
        * connectors/dds4ccm/impl/dds/EntityFactoryQosPolicy.h:
        * connectors/dds4ccm/impl/dds/GroupDataQosPolicy.h:
        * connectors/dds4ccm/impl/dds/HistoryQosPolicy.h:
        * connectors/dds4ccm/impl/dds/InconsistentTopicStatus.h:
        * connectors/dds4ccm/impl/dds/InstanceHandleSeq.h:
        * connectors/dds4ccm/impl/dds/InstanceHandle_t.h:
        * connectors/dds4ccm/impl/dds/LatencyBudgetQosPolicy.h:
        * connectors/dds4ccm/impl/dds/LifespanQosPolicy.h:
        * connectors/dds4ccm/impl/dds/LivelinessChangedStatus.h:
        * connectors/dds4ccm/impl/dds/LivelinessLostStatus.h:
        * connectors/dds4ccm/impl/dds/LivelinessQosPolicy.h:
        * connectors/dds4ccm/impl/dds/OfferedDeadlineMissedStatus.h:
        * connectors/dds4ccm/impl/dds/OfferedIncompatibleQosStatus.h:
        * connectors/dds4ccm/impl/dds/OwnershipQosPolicy.h:
        * connectors/dds4ccm/impl/dds/OwnershipStrengthQosPolicy.h:
        * connectors/dds4ccm/impl/dds/PartitionQosPolicy.h:
        * connectors/dds4ccm/impl/dds/PresentationQosPolicy.h:
        * connectors/dds4ccm/impl/dds/PublicationBuiltinTopicData.h:
        * connectors/dds4ccm/impl/dds/PublicationMatchedStatus.h:
        * connectors/dds4ccm/impl/dds/PublisherQos.h:
        * connectors/dds4ccm/impl/dds/QosPolicyCountSeq.h:
        * connectors/dds4ccm/impl/dds/ReaderDataLifecycleQosPolicy.h:
        * connectors/dds4ccm/impl/dds/ReliabilityQosPolicy.h:
        * connectors/dds4ccm/impl/dds/RequestedDeadlineMissedStatus.h:
        * connectors/dds4ccm/impl/dds/RequestedIncompatibleQosStatus.h:
        * connectors/dds4ccm/impl/dds/ResourceLimitsQosPolicy.h:
        * connectors/dds4ccm/impl/dds/SampleInfo.h:
        * connectors/dds4ccm/impl/dds/SampleLostStatus.h:
        * connectors/dds4ccm/impl/dds/SampleRejectedStatus.h:
        * connectors/dds4ccm/impl/dds/StringSeq.h:
        * connectors/dds4ccm/impl/dds/SubscriberQos.h:
        * connectors/dds4ccm/impl/dds/SubscriptionMatchedStatus.h:
        * connectors/dds4ccm/impl/dds/TimeBasedFilterQosPolicy.h:
        * connectors/dds4ccm/impl/dds/TimeUtilities.h:
        * connectors/dds4ccm/impl/dds/Time_t.h:
        * connectors/dds4ccm/impl/dds/TopicDataQosPolicy.h:
        * connectors/dds4ccm/impl/dds/TopicQos.h:
        * connectors/dds4ccm/impl/dds/TransportPriorityQosPolicy.h:
        * connectors/dds4ccm/impl/dds/UserDataQosPolicy.h:
        * connectors/dds4ccm/impl/dds/WriterDataLifecycleQosPolicy.h:
        * connectors/dds4ccm/impl/ndds/*:
          - Renamed /impl/ndds to /impl/dds. Added /impl/dds/ndds for all
            NDDS specific header files.
          - Replaced last C++ new's with ACE_NEW* marcros.
          - Implemented latest sreaming operators for NDDS specific
            conversions.
          - Renamed rti_xxx variable names to ccm_dds_xxx.
          - Renamed namespace RTI to DDS_CCM.

        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc:
        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc:
          Renamed /impl/ndds to /impl/dds. Added /impl/dds/ndds for all
          NDDS specific header files.
          Added a value_type-test for these tests.

1 files changed, 0 insertions, 214 deletions

diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
deleted file mode 100644
index 935db7d77e3..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-// $Id$
-
-#include "Topic.h"
-#include "ContentFilteredTopic.h"
-#include "StatusCondition.h"
-#include "TopicListener.h"
-#include "InstanceHandle_t.h"
-#include "InconsistentTopicStatus.h"
-#include "TopicQos.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    CCM_DDS_Topic_i::CCM_DDS_Topic_i (DDSTopic* topic)
-      : impl_ (topic)
-    {
-    }
-
-    CCM_DDS_Topic_i::~CCM_DDS_Topic_i (void)
-    {
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Topic_i::set_qos (const ::DDS::TopicQos &qos)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_TopicQos ddsqos;
-      ddsqos <<= qos;
-      return this->impl ()->set_qos (ddsqos);
-#else
-      return this->impl ()->set_qos (qos);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Topic_i::get_qos (::DDS::TopicQos &qos)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_TopicQos ddsqos;
-      ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos);
-      qos <<= ddsqos;
-      return retval;
-#else
-      return this->impl ()->get_qos (qos);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Topic_i::set_listener (
-      ::DDS::TopicListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Topic_i::set_listener");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_TopicListener_i *rti_impl_list = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_impl_list,
-                            CCM_DDS_TopicListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      return this->impl ()->set_listener (rti_impl_list, mask);
-#else
-      return this->impl ()->set_listener (a_listener, mask);
-#endif
-    }
-
-    ::DDS::TopicListener_ptr
-    CCM_DDS_Topic_i::get_listener (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Topic_i::get_listener");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSTopicListener *rti_topic_list = this->impl ()->get_listener ();
-      CCM_DDS_TopicListener_i *list_proxy = dynamic_cast <CCM_DDS_TopicListener_i *> (rti_topic_list);
-      if (!list_proxy)
-        {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Topic_i::get_listener - "
-                                    "DDS returned a NIL listener.\n"));
-          return ::DDS::TopicListener::_nil ();
-        }
-      return list_proxy->get_topiclistener ();
-#else
-      return this->impl ()->get_listener ();
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Topic_i::get_inconsistent_topic_status (
-      ::DDS::InconsistentTopicStatus & a_status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_InconsistentTopicStatus ddsstatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_inconsistent_topic_status (ddsstatus);
-      a_status <<= ddsstatus;;
-      return retval;
-#else
-      return this->impl ()->get_inconsistent_topic_status (a_status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Topic_i::enable (void)
-    {
-      return this->impl ()->enable ();
-    }
-
-    ::DDS::StatusCondition_ptr
-    CCM_DDS_Topic_i::get_statuscondition (void)
-    {
-      ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::StatusMask
-    CCM_DDS_Topic_i::get_status_changes (void)
-    {
-      return this->impl ()->get_status_changes ();
-    }
-
-    ::DDS::InstanceHandle_t
-    CCM_DDS_Topic_i::get_instance_handle (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-#else
-      return this->impl ()->get_instance_handle ();
-#endif
-    }
-
-    char *
-    CCM_DDS_Topic_i::get_type_name (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      return CORBA::string_dup (this->impl ()->get_type_name ());
-#else
-      return this->impl ()->get_type_name ();
-#endif
-    }
-
-    char *
-    CCM_DDS_Topic_i::get_name (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      return CORBA::string_dup (this->impl ()->get_name ());
-#else
-      return this->impl ()->get_name ();
-#endif
-    }
-
-    ::DDS::DomainParticipant_ptr
-    CCM_DDS_Topic_i::get_participant (void)
-    {
-      ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDomainParticipant* p = this->impl ()->get_participant ();
-      if (p)
-        {
-          ACE_NEW_THROW_EX (retval,
-                            CCM_DDS_DomainParticipant_i (p),
-                            CORBA::NO_MEMORY ());
-        }
-#else
-      ::DDS::DomainParticipant_var p = this->impl ()->get_participant ();
-      if (!CORBA::is_nil (p.in ()))
-        {
-          ACE_NEW_THROW_EX (retval,
-                            CCM_DDS_DomainParticipant_i (p.in ()),
-                            CORBA::NO_MEMORY ());
-        }
-#endif
-      return retval._retn ();
-    }
-
-    DDSTopic *
-    CCM_DDS_Topic_i::get_impl (void)
-    {
-      return this->impl_;
-    }
-
-    void
-    CCM_DDS_Topic_i::set_impl (DDSTopic * topic)
-    {
-      this->impl_ = topic;
-    }
-
-    DDSTopic *
-    CCM_DDS_Topic_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
-      }
-  }
-}