Wed Feb 24 07:28:52 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

* connectors/dds4ccm/idl/dds_rtf2_dcps.idl * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp * connectors/dds4ccm/impl/ndds/DataReader.cpp * connectors/dds4ccm/impl/ndds/DataReader.h * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp * connectors/dds4ccm/impl/ndds/DataReaderQos.h * connectors/dds4ccm/impl/ndds/DataWriter.cpp * connectors/dds4ccm/impl/ndds/DataWriter.h * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp * connectors/dds4ccm/impl/ndds/DataWriterListener.h * connectors/dds4ccm/impl/ndds/DataWriterQos.h * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp * connectors/dds4ccm/impl/ndds/DomainParticipant.h * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h * connectors/dds4ccm/impl/ndds/Duration_t.h * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h * connectors/dds4ccm/impl/ndds/Publisher.cpp * connectors/dds4ccm/impl/ndds/PublisherListener.cpp * connectors/dds4ccm/impl/ndds/PublisherListener.h * connectors/dds4ccm/impl/ndds/PublisherQos.h * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h * connectors/dds4ccm/impl/ndds/QueryCondition.cpp * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h * connectors/dds4ccm/impl/ndds/SampleInfo.h * connectors/dds4ccm/impl/ndds/SampleLostStatus.h * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h * connectors/dds4ccm/impl/ndds/StringSeq.h * connectors/dds4ccm/impl/ndds/Subscriber.cpp * connectors/dds4ccm/impl/ndds/Subscriber.h * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp * connectors/dds4ccm/impl/ndds/SubscriberListener.h * connectors/dds4ccm/impl/ndds/SubscriberQos.h * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h * connectors/dds4ccm/impl/ndds/Time_t.h * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h * connectors/dds4ccm/impl/ndds/TimeUtilities.h * connectors/dds4ccm/impl/ndds/Topic.cpp * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h * connectors/dds4ccm/impl/ndds/TopicDescription.h * connectors/dds4ccm/impl/ndds/TopicListener.cpp * connectors/dds4ccm/impl/ndds/TopicQos.h * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h Guarded all RTI specific code
author: Johnny Willemsen <jwillemsen@remedy.nl> 2010-02-24 07:29:51 +0000
committer: Johnny Willemsen <jwillemsen@remedy.nl> 2010-02-24 07:29:51 +0000
commit: 4cadf4af778183f21ede7115bb8969f684a2b35b (patch)
tree: b306ca6d075909a22cf12f8987f615d57b088adf
parent: 2245e154246e9cbff7000fdc10e1265a1dc5c053 (diff)
download: ATCD-4cadf4af778183f21ede7115bb8969f684a2b35b.tar.gz
75 files changed, 1012 insertions, 96 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index a794fdde202..fd53bf6da17 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,9 +1,90 @@
+Wed Feb 24 07:28:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
+        * connectors/dds4ccm/impl/ndds/DataReader.cpp
+        * connectors/dds4ccm/impl/ndds/DataReader.h
+        * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
+        * connectors/dds4ccm/impl/ndds/DataReaderQos.h
+        * connectors/dds4ccm/impl/ndds/DataWriter.cpp
+        * connectors/dds4ccm/impl/ndds/DataWriter.h
+        * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
+        * connectors/dds4ccm/impl/ndds/DataWriterListener.h
+        * connectors/dds4ccm/impl/ndds/DataWriterQos.h
+        * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
+        * connectors/dds4ccm/impl/ndds/DomainParticipant.h
+        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
+        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
+        * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
+        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
+        * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
+        * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/Duration_t.h
+        * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
+        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
+        * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
+        * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
+        * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
+        * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
+        * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
+        * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
+        * connectors/dds4ccm/impl/ndds/Publisher.cpp
+        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp
+        * connectors/dds4ccm/impl/ndds/PublisherListener.h
+        * connectors/dds4ccm/impl/ndds/PublisherQos.h
+        * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
+        * connectors/dds4ccm/impl/ndds/QueryCondition.cpp
+        * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
+        * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
+        * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/SampleInfo.h
+        * connectors/dds4ccm/impl/ndds/SampleLostStatus.h
+        * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
+        * connectors/dds4ccm/impl/ndds/StringSeq.h
+        * connectors/dds4ccm/impl/ndds/Subscriber.cpp
+        * connectors/dds4ccm/impl/ndds/Subscriber.h
+        * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
+        * connectors/dds4ccm/impl/ndds/SubscriberListener.h
+        * connectors/dds4ccm/impl/ndds/SubscriberQos.h
+        * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
+        * connectors/dds4ccm/impl/ndds/Time_t.h
+        * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/TimeUtilities.h
+        * connectors/dds4ccm/impl/ndds/Topic.cpp
+        * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/TopicDescription.h
+        * connectors/dds4ccm/impl/ndds/TopicListener.cpp
+        * connectors/dds4ccm/impl/ndds/TopicQos.h
+        * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
+        * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
+          Guarded all RTI specific code
+
+        * MPC/config/dds4ccm.mpb:
+          Don't compile anything related to dds4ccm when we don't have
+          a dds vendor installed
+
 Tue Feb 23 21:49:52 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp:
 
-          Rogue letter was causing a compile error. 
-        
+          Rogue letter was causing a compile error.
+
 Tue Feb 23 16:22:42 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/MPC/config/dance_convert_plan.mpb:
diff --git a/CIAO/MPC/config/dds4ccm.mpb b/CIAO/MPC/config/dds4ccm.mpb
index 8c07b2633fa..ef000593b71 100644
--- a/CIAO/MPC/config/dds4ccm.mpb
+++ b/CIAO/MPC/config/dds4ccm.mpb
@@ -15,3 +15,7 @@ feature(dds4ccm_ndds) : taoidldefaults {
   idlflags += -DCIAO_DDS4CCM_NDDS=1
 }
 
+feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) {
+  requires += dummy_label
+}
+
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
index e8aaf881028..41a7e6621c1 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
@@ -129,12 +129,16 @@ module DDS
 
 module DDS
 {
-  local interface ContentFilteredTopic {};
+  local interface CCM_ContentFilteredTopic : ::DDS::ContentFilteredTopic
+  {
+  };
 };
 
 module DDS
 {
-  local interface MultiTopic {};
+  local interface CCM_MultiTopic : ::DDS::MultiTopic
+  {
+  };
 };
 
 module DDS
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
index 8ecf2005acb..dee53d8ac70 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
@@ -33,10 +33,15 @@ namespace CIAO
         ::DDS::StringSeq & expression_parameters)
       {
         DDS4CCM_TRACE ("RTI_ContentFilteredTopic_i::get_expression_parameters");
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_StringSeq parameters;
         ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters (
                                                                     parameters);
         expression_parameters <<= parameters;
+#else
+        ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters (
+                                                                    expression_parameters);
+#endif        
         return retval;
       }
 
@@ -46,10 +51,13 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_ContentFilteredTopic_i::set_expression_parameters");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_StringSeq parameters;
         parameters <<= expression_parameters;
-
         return this->impl ()->set_expression_parameters (parameters);
+#else
+        return this->impl ()->set_expression_parameters (expression_parameters);
+#endif        
       }
 
       ::DDS::Topic_ptr
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
index 06907c9b6ef..7aa512fca47 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
@@ -45,6 +45,7 @@ namespace CIAO
       ::DDS::StatusCondition_ptr
       RTI_DataReader_i::get_statuscondition (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_StatusCondition_i (),
@@ -54,6 +55,9 @@ namespace CIAO
         RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
         rti_sc->set_impl (sc);
         return retval._retn ();
+#else
+        return this->impl ()->get_statuscondition ();
+#endif        
       }
 
       ::DDS::StatusMask
@@ -62,13 +66,17 @@ namespace CIAO
         return this->impl ()->get_status_changes ();
       }
 
-      ::DDS::InstanceHandle_t
+      DDS_INSTANCE_HANDLE_T_RETN
       RTI_DataReader_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        
       }
 
       ::DDS::ReadCondition_ptr
@@ -77,6 +85,7 @@ namespace CIAO
         ::DDS::ViewStateMask view_states,
         ::DDS::InstanceStateMask instance_states)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::ReadCondition_var retval = ::DDS::ReadCondition::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_ReadCondition_i (),
@@ -86,6 +95,9 @@ namespace CIAO
         RTI_ReadCondition_i *rti_rc = dynamic_cast < RTI_ReadCondition_i *>(retval.in ());
         rti_rc->set_impl (rc);
         return retval._retn ();
+#else
+        return this->impl ()->create_readcondition (sample_states, view_states, instance_states);
+#endif        
       }
 
       ::DDS::QueryCondition_ptr
@@ -96,6 +108,7 @@ namespace CIAO
         const char * query_expression,
         const ::DDS::StringSeq & query_parameters)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_StringSeq parameters;
         parameters <<= query_parameters;
 
@@ -114,18 +127,30 @@ namespace CIAO
         RTI_QueryCondition_i *rti_qc = dynamic_cast < RTI_QueryCondition_i *> (retval.in ());
         rti_qc->set_impl (qc);
         return retval._retn ();
+#else
+        return this->impl ()->create_querycondition (
+                                       sample_states,
+                                       view_states,
+                                       instance_states,
+                                       query_expression,
+                                       query_parameters);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::delete_readcondition (
         ::DDS::ReadCondition_ptr a_condition)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_ReadCondition_i *rc = dynamic_cast< RTI_ReadCondition_i *> (a_condition);
         if (!rc)
           {
             return ::DDS::RETCODE_BAD_PARAMETER;
           }
         return this->impl ()->delete_readcondition (rc->get_impl ());
+#else
+        return this->impl ()->delete_readcondition (a_condition);
+#endif        
       }
 
       ::DDS::ReturnCode_t
@@ -138,19 +163,27 @@ namespace CIAO
       RTI_DataReader_i::set_qos (
         const ::DDS::DataReaderQos &qos)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_DataReaderQos ddsqos;
         ddsqos <<= qos;
         return this->impl ()->set_qos (ddsqos);
+#else
+        return this->impl ()->set_qos (qos);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::get_qos (
         ::DDS::DataReaderQos &qos)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_DataReaderQos 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
@@ -160,6 +193,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_DataReader_i::set_listener");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_DataReaderListener_i *rti_drl = 0;
         if (!CORBA::is_nil (a_listener))
           {
@@ -168,6 +202,9 @@ namespace CIAO
                               CORBA::NO_MEMORY ());
           }
         return this->impl ()->set_listener (rti_drl, mask);
+#else
+        return this->impl ()->set_listener (a_listener, mask);
+#endif        
       }
 
       ::DDS::DataReaderListener_ptr
@@ -175,6 +212,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_DataReader_i::get_listener");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDSDataReaderListener *drl = this->impl ()->get_listener ();
         RTI_DataReaderListener_i *rti_drl = dynamic_cast <RTI_DataReaderListener_i *> (drl);
         if (!rti_drl)
@@ -184,11 +222,15 @@ namespace CIAO
             return ::DDS::DataReaderListener::_nil ();
           }
         return rti_drl->get_datareaderlistener ();
+#else
+        return this->impl ()->get_listener ();
+#endif        
       }
 
       ::DDS::TopicDescription_ptr
       RTI_DataReader_i::get_topicdescription (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::TopicDescription_var dds_td = ::DDS::TopicDescription::_nil ();
         ACE_NEW_THROW_EX (dds_td,
                           RTI_TopicDescription_i (),
@@ -198,11 +240,15 @@ namespace CIAO
         RTI_TopicDescription_i *rti_td = dynamic_cast < RTI_TopicDescription_i *>(dds_td.in ());
         rti_td->set_impl (td);
         return dds_td._retn ();
+#else
+        return this->impl ()->get_topicdescription ();
+#endif        
       }
 
       ::DDS::Subscriber_ptr
       RTI_DataReader_i::get_subscriber (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::Subscriber_var dds_td = ::DDS::Subscriber::_nil ();
         ACE_NEW_THROW_EX (dds_td,
                           RTI_Subscriber_i (),
@@ -212,94 +258,133 @@ namespace CIAO
         RTI_Subscriber_i *sub = dynamic_cast < RTI_Subscriber_i *>(dds_td.in ());
         sub->set_impl (subscriber);
         return dds_td._retn ();
+#else
+        return this->impl ()->get_subscriber ();
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::get_sample_rejected_status (
         ::DDS::SampleRejectedStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_SampleRejectedStatus rtistatus;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_rejected_status (rtistatus);
         rtistatus >>= status;
         return retval;
+#else
+        return this->impl ()->get_sample_rejected_status (status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::get_liveliness_changed_status (
         ::DDS::LivelinessChangedStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_LivelinessChangedStatus rtistatus;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_changed_status (rtistatus);
         rtistatus >>= status;
         return retval;
+#else
+        return this->impl ()->get_liveliness_changed_status (status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::get_requested_deadline_missed_status (
         ::DDS::RequestedDeadlineMissedStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_RequestedDeadlineMissedStatus rtistatus;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_deadline_missed_status (rtistatus);
         rtistatus >>= status;
         return retval;
+#else
+        return this->impl ()->get_requested_deadline_missed_status (status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::get_requested_incompatible_qos_status (
         ::DDS::RequestedIncompatibleQosStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_RequestedIncompatibleQosStatus rtistatus;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_incompatible_qos_status (rtistatus);
         rtistatus >>= status;
         return retval;
+#else
+        return this->impl ()->get_requested_incompatible_qos_status (status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::get_subscription_matched_status (
         ::DDS::SubscriptionMatchedStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_SubscriptionMatchedStatus ddsstatus;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_subscription_matched_status (ddsstatus);
         ddsstatus >>= status;
         return retval;
+#else
+        return this->impl ()->get_subscription_matched_status (status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::get_sample_lost_status (
         ::DDS::SampleLostStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_SampleLostStatus rtistatus;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_lost_status (rtistatus);
         rtistatus >>= status;
         return retval;
+#else
+        return this->impl ()->get_sample_lost_status (status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::wait_for_historical_data (
         const ::DDS::Duration_t & max_wait)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
        ::DDS_Duration_t rtiduration;
        rtiduration <<= max_wait;
        return this->impl ()->wait_for_historical_data (rtiduration);
+#else
+       return this->impl ()->wait_for_historical_data (max_wait);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::get_matched_publications (
         ::DDS::InstanceHandleSeq & publication_handles)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_InstanceHandleSeq rtiseq;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_publications (rtiseq);
         rtiseq >>= publication_handles;
         return retval;
+#else
+        return this->impl ()->get_matched_publications (publication_handles);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataReader_i::get_matched_publication_data (
-        ::DDS::PublicationBuiltinTopicData & /*publication_data*/,
-        const ::DDS::InstanceHandle_t & /*publication_handle*/)
+        ::DDS::PublicationBuiltinTopicData & publication_data,
+        DDS_INSTANCE_HANDLE_T_IN publication_handle)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         throw CORBA::NO_IMPLEMENT ();
         // Add your implementation here
+#else
+        return this->impl ()->get_matched_publication_data (publication_data, publication_handle);
+#endif        
       }
 
       DDSDataReader *
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
index 015f26c870d..4d641598698 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
@@ -15,6 +15,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 #include "tao/LocalObject.h"
 
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
@@ -51,7 +52,7 @@ namespace CIAO
         virtual ::DDS::StatusMask
         get_status_changes (void);
 
-        virtual ::DDS::InstanceHandle_t
+        virtual DDS_INSTANCE_HANDLE_T_RETN
         get_instance_handle (void);
 
         virtual ::DDS::ReadCondition_ptr
@@ -127,7 +128,7 @@ namespace CIAO
         virtual ::DDS::ReturnCode_t
         get_matched_publication_data (
           ::DDS::PublicationBuiltinTopicData & publication_data,
-          const ::DDS::InstanceHandle_t & publication_handle);
+          DDS_INSTANCE_HANDLE_T_IN publication_handle);
 
         DDSDataReader * get_impl (void);
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
index fdc36eef440..49767d79dc9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
@@ -34,6 +34,7 @@ namespace CIAO
         const ::DDS_RequestedDeadlineMissedStatus & status)
       {
         DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_requested_deadline_missed");
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::RequestedDeadlineMissedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -41,6 +42,9 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_requested_deadline_missed (the_reader, status);
+#endif        
       }
 
       void
@@ -49,6 +53,7 @@ namespace CIAO
         const ::DDS_RequestedIncompatibleQosStatus & status)
       {
         DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_requested_incompatible_qos");
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::RequestedIncompatibleQosStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -56,6 +61,9 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_requested_incompatible_qos (the_reader, status);
+#endif        
       }
 
       void
@@ -64,6 +72,7 @@ namespace CIAO
         const ::DDS_SampleRejectedStatus & status)
       {
         DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_sample_rejected");
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::SampleRejectedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -71,6 +80,9 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_sample_rejected (the_reader, status);
+#endif        
       }
 
       void
@@ -79,6 +91,7 @@ namespace CIAO
         const ::DDS_LivelinessChangedStatus & status)
       {
         DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_liveliness_changed");
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::LivelinessChangedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -86,17 +99,24 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_liveliness_changed (the_reader, status);
+#endif        
       }
 
       void
       RTI_DataReaderListener_i::on_data_available(::DDSDataReader *the_reader)
       {
         DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_data_available");
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
         ACE_NEW (dds_reader, RTI_DataReader_i ());
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_data_available (dds_reader.in ());
+#else
+        this->impl_->on_data_available (the_reader);
+#endif        
       }
 
       void
@@ -105,6 +125,7 @@ namespace CIAO
         const ::DDS_SubscriptionMatchedStatus & status)
       {
         DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_subscription_matched");
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::SubscriptionMatchedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -112,6 +133,9 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_subscription_matched (the_reader, status);
+#endif        
       }
 
       void
@@ -120,6 +144,7 @@ namespace CIAO
         const ::DDS_SampleLostStatus & status)
       {
         DDS4CCM_TRACE ("RTI_DataReaderListener_i::on_sample_lost");
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::SampleLostStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -127,6 +152,9 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_sample_lost (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_sample_lost (the_reader, status);
+#endif        
       }
 
       ::DDS::DataReaderListener_ptr
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
index 21b523b51cd..948dc8399d3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
@@ -22,6 +22,11 @@
 #include "TimeBasedFilterQosPolicy.h"
 #include "ReaderDataLifecycleQosPolicy.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DataReaderQos DDS_DataReaderQos;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DataReaderQos &ddsqos, const ::DDS_DataReaderQos & qos)
 {
@@ -89,5 +94,6 @@ operator>>= (const ::DDS::DataReaderQos &qos, ::DDS_DataReaderQos & ddsqos)
   ddsqos.time_based_filter <<= qos.time_based_filter;
   ddsqos.reader_data_lifecycle <<= qos.reader_data_lifecycle;
 }
+#endif
 
 #endif /* CIAO_RTI_DATAREADERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
index 475643103c0..11bc06a0ba9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
@@ -31,25 +31,34 @@ namespace CIAO
       }
 
       ::DDS::ReturnCode_t
-      RTI_DataWriter_i::set_qos (const ::DDS::DataWriterQos & /*qos*/)
+      RTI_DataWriter_i::set_qos (const ::DDS::DataWriterQos & qos)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS4CCM_TRACE ("RTI_DataWriter_i::set_qos");
         throw CORBA::NO_IMPLEMENT ();
         // Add your implementation here
+#else
+        return this->impl ()->set_qos (qos);
+#endif        
       }
 
       ::DDS::ReturnCode_t
-      RTI_DataWriter_i::get_qos (::DDS::DataWriterQos & /*qos*/)
+      RTI_DataWriter_i::get_qos (::DDS::DataWriterQos & qos)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS4CCM_TRACE ("RTI_DataWriter_i::get_qos");
         throw CORBA::NO_IMPLEMENT ();
         // Add your implementation here
+#else
+        return this->impl ()->get_qos (qos);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataWriter_i::set_listener (::DDS::DataWriterListener_ptr a_listener,
                                       ::DDS::StatusMask mask)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_DataWriterListener_i* rti_impl_list = 0;
         if (!CORBA::is_nil (a_listener))
           {
@@ -58,11 +67,15 @@ namespace CIAO
                               CORBA::NO_MEMORY ());
           }
         return this->impl ()->set_listener (rti_impl_list, mask);
+#else
+        return this->impl ()->set_listener (a_listener, mask);
+#endif        
       }
 
       ::DDS::DataWriterListener_ptr
       RTI_DataWriter_i::get_listener (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDSDataWriterListener *wr = this->impl ()->get_listener ();
         RTI_DataWriterListener_i *list_proxy = dynamic_cast <RTI_DataWriterListener_i *> (wr);
         if (!list_proxy)
@@ -72,11 +85,15 @@ namespace CIAO
             return ::DDS::DataWriterListener::_nil ();
           }
         return list_proxy->get_datawriterlistener ();
+#else
+        return this->impl ()->get_listener ();
+#endif        
       }
 
       ::DDS::Topic_ptr
       RTI_DataWriter_i::get_topic (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::Topic_var retval = ::DDS::Topic::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_Topic_i (),
@@ -86,11 +103,15 @@ namespace CIAO
         RTI_Topic_i *tp = dynamic_cast < RTI_Topic_i *> (retval.in ());
         tp->set_impl (t);
         return retval._retn ();
+#else
+        return this->impl ()->get_topic ();
+#endif        
       }
 
       ::DDS::Publisher_ptr
       RTI_DataWriter_i::get_publisher (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::Publisher_var retval = ::DDS::Publisher::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_Publisher_i (),
@@ -100,50 +121,73 @@ namespace CIAO
         RTI_Publisher_i *rti_p = dynamic_cast < RTI_Publisher_i *> (retval.in ());
         rti_p->set_impl (p);
         return retval._retn ();
+#else
+        return this->impl ()->get_publisher ();
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataWriter_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
        ::DDS_Duration_t rtiduration;
        rtiduration <<= max_wait;
        return this->impl ()->wait_for_acknowledgments (rtiduration);
+#else
+       return this->impl ()->wait_for_acknowledgments (max_wait);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataWriter_i::get_liveliness_lost_status (::DDS::LivelinessLostStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_LivelinessLostStatus rtistatus;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_lost_status (rtistatus);
         rtistatus >>= status;
         return retval;
+#else
+        return this->impl ()->get_liveliness_lost_status (status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataWriter_i::get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_OfferedDeadlineMissedStatus rtistatus;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_deadline_missed_status (rtistatus);
         rtistatus >>= status;
         return retval;
+#else
+        return this->impl ()->get_offered_deadline_missed_status (status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataWriter_i::get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_OfferedIncompatibleQosStatus rtistatus;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_incompatible_qos_status (rtistatus);
         rtistatus >>= status;
         return retval;
+#else
+        return this->impl ()->get_offered_incompatible_qos_status (status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_DataWriter_i::get_publication_matched_status (::DDS::PublicationMatchedStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_PublicationMatchedStatus rtistatus;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_publication_matched_status (rtistatus);
         rtistatus >>= status;
         return retval;
+#else
+        return this->impl ()->get_publication_matched_status (status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
@@ -155,19 +199,27 @@ namespace CIAO
       ::DDS::ReturnCode_t
       RTI_DataWriter_i::get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_InstanceHandleSeq rtiseq;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_subscriptions (rtiseq);
         rtiseq >>= subscription_handles;
         return retval;
+#else
+        return this->impl ()->get_matched_subscriptions (subscription_handles);
+#endif        
       }
 
       ::DDS::ReturnCode_t
-      RTI_DataWriter_i::get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & /*subscription_data*/,
-                                                       const ::DDS::InstanceHandle_t & /*subscription_handle*/)
+      RTI_DataWriter_i::get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data,
+                                                       DDS_INSTANCE_HANDLE_T_IN subscription_handle)
       {
         DDS4CCM_TRACE ("RTI_DataWriter_i::get_matched_subscription_data");
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         throw CORBA::NO_IMPLEMENT ();
         // Add your implementation here
+#else
+        return this->impl ()->get_matched_subscription_data (subscription_data, subscription_handle);
+#endif        
       }
 
       ::DDS::ReturnCode_t
@@ -179,6 +231,7 @@ namespace CIAO
       ::DDS::StatusCondition_ptr
       RTI_DataWriter_i::get_statuscondition (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_StatusCondition_i (),
@@ -188,6 +241,9 @@ namespace CIAO
         RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
         rti_sc->set_impl (sc);
         return retval._retn ();
+#else
+        return this->impl ()->get_statuscondition ();
+#endif        
       }
 
       ::DDS::StatusMask
@@ -196,13 +252,17 @@ namespace CIAO
         return this->impl ()->get_status_changes ();
       }
 
-      ::DDS::InstanceHandle_t
+      DDS_INSTANCE_HANDLE_T_RETN
       RTI_DataWriter_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        
       }
 
       DDSDataWriter *
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
index b249c023b6f..89e72680c1b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
@@ -15,6 +15,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 #include "tao/LocalObject.h"
 
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
@@ -84,7 +85,7 @@ namespace CIAO
 
         virtual
           ::DDS::ReturnCode_t get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data,
-                                                             const ::DDS::InstanceHandle_t & subscription_handle);
+                                                             DDS_INSTANCE_HANDLE_T_IN subscription_handle);
 
         virtual
           ::DDS::ReturnCode_t enable (void);
@@ -96,7 +97,7 @@ namespace CIAO
           ::DDS::StatusMask get_status_changes (void);
 
         virtual
-          ::DDS::InstanceHandle_t get_instance_handle (void);
+          DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void);
 
         DDSDataWriter * get_impl (void);
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
index e67728ff1ef..bdbeb97994a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
@@ -27,6 +27,7 @@ namespace CIAO
         ::DDSDataWriter *the_writer,
         const ::DDS_OfferedDeadlineMissedStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::OfferedDeadlineMissedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
@@ -34,6 +35,9 @@ namespace CIAO
         RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
         dw->set_impl (the_writer);
         this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus);
+#else
+        this->impl_->on_offered_deadline_missed (the_writer, status);
+#endif        
       }
 
       void
@@ -41,6 +45,7 @@ namespace CIAO
         ::DDSDataWriter *the_writer,
         const ::DDS_OfferedIncompatibleQosStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::OfferedIncompatibleQosStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
@@ -48,6 +53,9 @@ namespace CIAO
         RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
         dw->set_impl (the_writer);
         this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus);
+#else
+        this->impl_->on_offered_incompatible_qos (the_writer, status);
+#endif        
       }
 
       void
@@ -55,6 +63,7 @@ namespace CIAO
         ::DDSDataWriter *the_writer,
         const ::DDS_LivelinessLostStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::LivelinessLostStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
@@ -62,6 +71,9 @@ namespace CIAO
         RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
         dw->set_impl (the_writer);
         this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus);
+#else
+        this->impl_->on_liveliness_lost (the_writer, status);
+#endif        
       }
 
       void
@@ -69,6 +81,7 @@ namespace CIAO
         ::DDSDataWriter *the_writer,
         const ::DDS_PublicationMatchedStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::PublicationMatchedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
@@ -76,6 +89,9 @@ namespace CIAO
         RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
         dw->set_impl (the_writer);
         this->impl_->on_publication_matched (dds_writer.in (), ddsstatus);
+#else
+        this->impl_->on_publication_matched (the_writer, status);
+#endif        
       }
 
       ::DDS::DataWriterListener_ptr
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
index fb3ec35b0cc..7609eff7253 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
@@ -21,6 +21,15 @@
 # include "ndds/ndds_cpp.h"
 #endif
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DataWriterListener DDSDataWriterListener;
+typedef ::DDS::DataWriter DDSDataWriter;
+typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus;
+typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus;
+typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus;
+typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus;
+#endif
+
 namespace CIAO
 {
   namespace DDS4CCM
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
index 6b24d40d494..3cc9547a02f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
@@ -25,6 +25,11 @@
 #include "OwnershipStrengthQosPolicy.h"
 #include "WriterDataLifecycleQosPolicy.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DataWriterQos DDS_DataWriterQos;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DataWriterQos &ddsqos, const ::DDS_DataWriterQos & qos)
 {
@@ -104,5 +109,6 @@ operator>>= (const ::DDS::DataWriterQos &qos, ::DDS_DataWriterQos & ddsqos)
   ddsqos.ownership_strength <<= qos.ownership_strength;
   ddsqos.writer_data_lifecycle <<= qos.writer_data_lifecycle;
 }
+#endif
 
 #endif /* CIAO_RTI_DATAWRITERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
index 45a24e0c3b0..28d9de8cfc5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
@@ -11,6 +11,11 @@
 
 #include "Duration_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DeadlineQosPolicy DDS_DeadlineQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DeadlineQosPolicy &ddsqos, const ::DDS_DeadlineQosPolicy & qos)
 {
@@ -34,5 +39,6 @@ operator>>= (const ::DDS::DeadlineQosPolicy &qos, ::DDS_DeadlineQosPolicy & ddsq
 {
   ddsqos.period <<= qos.period;
 }
+#endif
 
 #endif /* CIAO_RTI_DEADLINEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
index 00b58fe57c7..bd0c080b85b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
@@ -11,6 +11,11 @@
 
 #include "Duration_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DestinationOrderQosPolicy DDS_DestinationOrderQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DestinationOrderQosPolicy &ddsqos, const ::DDS_DestinationOrderQosPolicy & qos)
 {
@@ -34,5 +39,6 @@ operator>>= (const ::DDS::DestinationOrderQosPolicy &qos, ::DDS_DestinationOrder
 {
   ddsqos.kind = static_cast < ::DDS_DestinationOrderQosPolicyKind> (qos.kind);
 }
+#endif
 
 #endif /* CIAO_RTI_DESTINATIONORDERQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
index fc981ce50be..dbe235eecf3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
@@ -39,6 +39,7 @@ namespace CIAO
         DDS4CCM_TRACE ("RTI_DomainParticipant_i::~RTI_DomainParticipant_i");
       }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::Publisher_ptr
       RTI_DomainParticipant_i::create_publisher_with_profile (
         const char* library_name,
@@ -85,13 +86,15 @@ namespace CIAO
 
         return retval._retn ();
       }
+#endif
 
       ::DDS::Publisher_ptr
       RTI_DomainParticipant_i::create_publisher (
-        const ::DDS::PublisherQos & /*qos*/,
+        const ::DDS::PublisherQos & qos,
         ::DDS::PublisherListener_ptr a_listener,
         ::DDS::StatusMask mask)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher");
 
         DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_publisher - "
@@ -132,11 +135,15 @@ namespace CIAO
         rti_p->set_impl (rti_pub);
 
         return retval._retn ();
+#else
+        return this->impl ()->create_publisher (qos, a_listener, mask);
+#endif
       }
 
       ::DDS::ReturnCode_t
       RTI_DomainParticipant_i::delete_publisher (::DDS::Publisher_ptr p)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_Publisher_i *rti_pub = dynamic_cast < RTI_Publisher_i * > (p);
 
         if (!rti_pub)
@@ -161,8 +168,12 @@ namespace CIAO
                           "Provided publisher successfully deleted\n"));
 
         return retval;
+#else
+        return this->impl ()->delete_publisher (p);
+#endif        
       }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::Subscriber_ptr
       RTI_DomainParticipant_i::create_subscriber_with_profile (
         const char* library_name,
@@ -211,14 +222,16 @@ namespace CIAO
 
         return retval._retn ();
       }
+#endif
 
       ::DDS::Subscriber_ptr
-      RTI_DomainParticipant_i::create_subscriber (const ::DDS::SubscriberQos & /*qos*/,
+      RTI_DomainParticipant_i::create_subscriber (const ::DDS::SubscriberQos & qos,
                                                   ::DDS::SubscriberListener_ptr a_listener,
                                                   ::DDS::StatusMask mask)
       {
         DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_subscriber - "
                      "Creating Subscriber\n"));
 
@@ -255,11 +268,17 @@ namespace CIAO
         rti_s->set_impl (rti_sub);
 
         return retval._retn ();
+#else
+        return this->impl ()->create_subscriber (qos,
+                                            a_listener,
+                                            mask);
+#endif
       }
 
       ::DDS::ReturnCode_t
       RTI_DomainParticipant_i::delete_subscriber (::DDS::Subscriber_ptr s)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_Subscriber_i *rti_sub = dynamic_cast < RTI_Subscriber_i * > (s);
 
         if (!rti_sub)
@@ -284,11 +303,15 @@ namespace CIAO
                           "Provided subscriber successfully deleted\n"));
 
         return retval;
+#else
+        return this->impl ()->delete_subscriber (s);
+#endif
       }
 
       ::DDS::Subscriber_ptr
       RTI_DomainParticipant_i::get_builtin_subscriber (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_Subscriber_i (),
@@ -298,17 +321,21 @@ namespace CIAO
         RTI_Subscriber_i *rti_s = dynamic_cast < RTI_Subscriber_i *> (retval.in ());
         rti_s->set_impl (rti_sub);
         return retval._retn ();
+#else
+        return this->impl ()->get_builtin_subscriber ();
+#endif
       }
 
       ::DDS::Topic_ptr
       RTI_DomainParticipant_i::create_topic (const char * impl_name,
                                              const char * type_name,
-                                             const ::DDS::TopicQos & /*qos*/,
+                                             const ::DDS::TopicQos & qos,
                                              ::DDS::TopicListener_ptr a_listener,
                                              ::DDS::StatusMask mask)
       {
         DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         if (impl_name == 0)
           {
             DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - "
@@ -363,8 +390,16 @@ namespace CIAO
         tp->set_impl (rti_topic);
 
         return retval._retn ();
+#else
+        return this->impl ()->create_topic (impl_name,
+                                                        type_name,
+                                                        qos,
+                                                        a_listener,
+                                                        mask);
+#endif
       }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::Topic_ptr
       RTI_DomainParticipant_i::create_topic_with_profile (
           const char *impl_name,
@@ -442,12 +477,14 @@ namespace CIAO
             return ::DDS::Topic::_duplicate (tp.in ());
           }
       }
+#endif
 
       ::DDS::ReturnCode_t
       RTI_DomainParticipant_i::delete_topic (::DDS::Topic_ptr a_topic)
       {
         DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_topic");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_Topic_i *top = dynamic_cast< RTI_Topic_i *> (a_topic);
 
         if (top == 0)
@@ -472,19 +509,23 @@ namespace CIAO
                           "Provided topic successfully deleted\n"));
 
         return retval;
+#else
+        return this->impl ()->delete_topic (a_topic);
+#endif
       }
 
       ::DDS::Topic_ptr
       RTI_DomainParticipant_i::find_topic (const char * impl_name,
                                            const ::DDS::Duration_t & timeout)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_Duration_t ddstimeout;
         ddstimeout <<= timeout;
         ::DDS::Topic_var retval = ::DDS::Topic::_nil ();
         ACE_NEW_RETURN (retval,
                         RTI_Topic_i (),
                         ::DDS::Topic::_nil ());
-        ::DDSTopic* rti_topic = this->impl ()->find_topic (impl_name, ddstimeout);
+        ::DDSTopic* rti_topic = this->impl ()->find_topic (impl_name, timeout);
         if (rti_topic)
           {
             RTI_Topic_i *tp = dynamic_cast < RTI_Topic_i *> (retval.in ());
@@ -492,11 +533,15 @@ namespace CIAO
             return retval._retn ();
           }
         return ::DDS::Topic::_nil ();
+#else
+        return this->impl ()->find_topic (impl_name, timeout);
+#endif
       }
 
       ::DDS::TopicDescription_ptr
       RTI_DomainParticipant_i::lookup_topicdescription (const char * name)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::TopicDescription_var retval = ::DDS::TopicDescription::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_TopicDescription_i (),
@@ -505,6 +550,9 @@ namespace CIAO
         RTI_TopicDescription_i *rti_td = dynamic_cast < RTI_TopicDescription_i *>(retval.in ());
         rti_td->set_impl (rti_topic);
         return retval._retn ();
+#else
+        return this->impl ()->lookup_topicdescription (name);
+#endif
       }
 
       ::DDS::ContentFilteredTopic_ptr
@@ -515,6 +563,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_contentfilteredtopic");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_Topic_i *top = dynamic_cast< RTI_Topic_i *> (related_topic);
         if (!top)
           {
@@ -560,6 +609,13 @@ namespace CIAO
         tp->set_impl (rti_cft);
 
         return retval._retn ();
+#else
+        return this->impl ()->create_contentfilteredtopic (
+                                                                    name,
+                                                                    related_topic,
+                                                                    filter_expression,
+                                                                    expression_parameters);
+#endif
       }
 
       ::DDS::ReturnCode_t
@@ -617,6 +673,7 @@ namespace CIAO
       RTI_DomainParticipant_i::set_listener (::DDS::DomainParticipantListener_ptr a_listener,
                                              ::DDS::StatusMask mask)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_DomainParticipantListener_i* rti_impl_list = 0;
         if (!CORBA::is_nil (a_listener))
           {
@@ -625,6 +682,9 @@ namespace CIAO
                               CORBA::NO_MEMORY ());
           }
         return this->impl_->set_listener (rti_impl_list, mask);
+#else
+        return this->impl_->set_listener (a_listener, mask);
+#endif        
       }
 
       ::DDS::DomainParticipantListener_ptr
@@ -632,6 +692,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_listener");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDSDomainParticipantListener *rti_dp_list = this->impl ()->get_listener ();
         RTI_DomainParticipantListener_i *list_proxy = dynamic_cast <RTI_DomainParticipantListener_i *> (rti_dp_list);
         if (!list_proxy)
@@ -641,39 +702,57 @@ namespace CIAO
             return ::DDS::DomainParticipantListener::_nil ();
           }
         return list_proxy->get_domainparticipantlistener ();
+#else
+        return this->impl ()->get_listener ();
+#endif        
       }
 
       ::DDS::ReturnCode_t
-      RTI_DomainParticipant_i::ignore_participant (const ::DDS::InstanceHandle_t & handle)
+      RTI_DomainParticipant_i::ignore_participant (DDS_INSTANCE_HANDLE_T_IN handle)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_InstanceHandle_t rti_handle;
         rti_handle <<= handle;
         return this->impl ()->ignore_participant (rti_handle);
-
+#else
+        return this->impl ()->ignore_participant (handle);
+#endif
       }
 
       ::DDS::ReturnCode_t
-      RTI_DomainParticipant_i::ignore_topic (const ::DDS::InstanceHandle_t & handle)
+      RTI_DomainParticipant_i::ignore_topic (DDS_INSTANCE_HANDLE_T_IN handle)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_InstanceHandle_t rti_handle;
         rti_handle <<= handle;
         return this->impl ()->ignore_topic (rti_handle);
+#else
+        return this->impl ()->ignore_topic (handle);
+#endif        
       }
 
       ::DDS::ReturnCode_t
-      RTI_DomainParticipant_i::ignore_publication (const ::DDS::InstanceHandle_t & handle)
+      RTI_DomainParticipant_i::ignore_publication (DDS_INSTANCE_HANDLE_T_IN handle)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_InstanceHandle_t rti_handle;
         rti_handle <<= handle;
         return this->impl ()->ignore_publication (rti_handle);
+#else
+        return this->impl ()->ignore_publication (handle);
+#endif
       }
 
       ::DDS::ReturnCode_t
-      RTI_DomainParticipant_i::ignore_subscription (const ::DDS::InstanceHandle_t & handle)
+      RTI_DomainParticipant_i::ignore_subscription (DDS_INSTANCE_HANDLE_T_IN handle)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_InstanceHandle_t rti_handle;
         rti_handle <<= handle;
         return this->impl ()->ignore_subscription (rti_handle);
+#else
+        return this->impl ()->ignore_subscription (handle);
+#endif
       }
 
       ::DDS::DomainId_t
@@ -739,15 +818,19 @@ namespace CIAO
       ::DDS::ReturnCode_t
       RTI_DomainParticipant_i::get_discovered_participants (::DDS::InstanceHandleSeq & impl_handles)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_InstanceHandleSeq rtiseq;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_participants (rtiseq);
         rtiseq >>= impl_handles;
         return retval;
+#else
+        return this->impl ()->get_discovered_participants (impl_handles);
+#endif
       }
 
       ::DDS::ReturnCode_t
       RTI_DomainParticipant_i::get_discovered_participant_data (::DDS::ParticipantBuiltinTopicData & /*impl_data*/,
-                                                                const ::DDS::InstanceHandle_t & /*impl_handle*/)
+                                                                DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/)
       {
         DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_participant_data");
         throw CORBA::NO_IMPLEMENT ();
@@ -757,15 +840,19 @@ namespace CIAO
       ::DDS::ReturnCode_t
       RTI_DomainParticipant_i::get_discovered_topics (::DDS::InstanceHandleSeq & impl_handles)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_InstanceHandleSeq rtiseq;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_topics (rtiseq);
         rtiseq >>= impl_handles;
         return retval;
+#else
+        return this->impl ()->get_discovered_topics (impl_handles);
+#endif
       }
 
       ::DDS::ReturnCode_t
       RTI_DomainParticipant_i::get_discovered_topic_data (::DDS::TopicBuiltinTopicData & /*impl_data*/,
-                                                          const ::DDS::InstanceHandle_t & /*impl_handle*/)
+                                                          DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/)
       {
         DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_topic_data");
         throw CORBA::NO_IMPLEMENT ();
@@ -773,22 +860,28 @@ namespace CIAO
       }
 
       ::CORBA::Boolean
-      RTI_DomainParticipant_i::contains_entity (const ::DDS::InstanceHandle_t & a_handle)
+      RTI_DomainParticipant_i::contains_entity (DDS_INSTANCE_HANDLE_T_IN a_handle)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS_InstanceHandle_t rti_handle;
         rti_handle <<= a_handle;
         return this->impl ()->contains_entity (rti_handle);
-
+#else
+        return this->impl ()->contains_entity (a_handle);
+#endif
       }
 
       ::DDS::ReturnCode_t
       RTI_DomainParticipant_i::get_current_time (::DDS::Time_t & current_time)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_Time_t rti_time;
         ::DDS::ReturnCode_t const retval = this->impl ()->get_current_time (rti_time);
         rti_time >>= current_time;
         return retval;
-
+#else
+        return this->impl ()->get_current_time (current_time);
+#endif
       }
 
       ::DDS::ReturnCode_t
@@ -800,6 +893,7 @@ namespace CIAO
       ::DDS::StatusCondition_ptr
       RTI_DomainParticipant_i::get_statuscondition (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_StatusCondition_i (),
@@ -808,6 +902,9 @@ namespace CIAO
         RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
         rti_sc->set_impl (sc);
         return retval._retn ();
+#else
+        return this->impl ()->get_statuscondition ();
+#endif
       }
 
       ::DDS::StatusMask
@@ -816,13 +913,17 @@ namespace CIAO
         return this->impl ()->get_status_changes ();
       }
 
-      ::DDS::InstanceHandle_t
+      DDS_INSTANCE_HANDLE_T_RETN
       RTI_DomainParticipant_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        
       }
 
       DDSDomainParticipant *
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
index 4b6feb0043f..807d9af5b2b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
@@ -13,6 +13,7 @@
 #include "tao/LocalObject.h"
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
@@ -47,11 +48,13 @@ namespace CIAO
           ::DDS::PublisherListener_ptr a_listener,
           ::DDS::StatusMask mask);
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         virtual ::DDS::Publisher_ptr create_publisher_with_profile (
           const char* library_name,
           const char *profile_name,
           ::DDS::PublisherListener_ptr a_listener,
           ::DDS::StatusMask mask);
+#endif          
 
         virtual ::DDS::ReturnCode_t delete_publisher (::DDS::Publisher_ptr p);
 
@@ -60,11 +63,13 @@ namespace CIAO
           ::DDS::SubscriberListener_ptr a_listener,
           ::DDS::StatusMask mask);
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         virtual ::DDS::Subscriber_ptr create_subscriber_with_profile(
           const char* library_name,
           const char *profile_name,
           ::DDS::SubscriberListener_ptr a_listener,
           ::DDS::StatusMask mask);
+#endif
 
         virtual ::DDS::ReturnCode_t delete_subscriber (::DDS::Subscriber_ptr s);
 
@@ -77,6 +82,7 @@ namespace CIAO
           ::DDS::TopicListener_ptr a_listener,
           ::DDS::StatusMask mask);
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         virtual ::DDS::Topic_ptr create_topic_with_profile (
           const char * impl_name,
           const char * type_name,
@@ -84,6 +90,7 @@ namespace CIAO
           const char *profile_name,
           ::DDS::TopicListener_ptr a_listener,
           ::DDS::StatusMask mask);
+#endif
 
         virtual ::DDS::ReturnCode_t delete_topic (::DDS::Topic_ptr a_topic);
 
@@ -127,16 +134,16 @@ namespace CIAO
         virtual ::DDS::DomainParticipantListener_ptr get_listener (void);
 
         virtual ::DDS::ReturnCode_t ignore_participant (
-          const ::DDS::InstanceHandle_t & handle);
+          DDS_INSTANCE_HANDLE_T_IN handle);
 
         virtual ::DDS::ReturnCode_t ignore_topic (
-          const ::DDS::InstanceHandle_t & handle);
+          DDS_INSTANCE_HANDLE_T_IN handle);
 
         virtual ::DDS::ReturnCode_t ignore_publication (
-          const ::DDS::InstanceHandle_t & handle);
+          DDS_INSTANCE_HANDLE_T_IN handle);
 
         virtual ::DDS::ReturnCode_t ignore_subscription (
-          const ::DDS::InstanceHandle_t & handle);
+          DDS_INSTANCE_HANDLE_T_IN handle);
 
         virtual ::DDS::DomainId_t get_domain_id (void);
 
@@ -165,17 +172,17 @@ namespace CIAO
 
         virtual ::DDS::ReturnCode_t get_discovered_participant_data (
           ::DDS::ParticipantBuiltinTopicData & impl_data,
-          const ::DDS::InstanceHandle_t & impl_handle);
+          DDS_INSTANCE_HANDLE_T_IN impl_handle);
 
         virtual ::DDS::ReturnCode_t get_discovered_topics (
           ::DDS::InstanceHandleSeq & impl_handles);
 
         virtual ::DDS::ReturnCode_t get_discovered_topic_data (
           ::DDS::TopicBuiltinTopicData & impl_data,
-          const ::DDS::InstanceHandle_t & impl_handle);
+          DDS_INSTANCE_HANDLE_T_IN impl_handle);
 
         virtual ::CORBA::Boolean contains_entity (
-          const ::DDS::InstanceHandle_t & a_handle);
+          DDS_INSTANCE_HANDLE_T_IN a_handle);
 
         virtual ::DDS::ReturnCode_t get_current_time (
           ::DDS::Time_t & current_time);
@@ -186,7 +193,7 @@ namespace CIAO
 
         virtual ::DDS::StatusMask get_status_changes (void);
 
-        virtual ::DDS::InstanceHandle_t get_instance_handle (void);
+        virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void);
 
         DDSDomainParticipant * get_impl (void);
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
index 6ef6b8999dd..3ed951edf51 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
@@ -8,6 +8,10 @@
 #include "dds4ccm/impl/logger/Log_Macros.h"
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef  ::DDS::DomainParticipantFactory DDSDomainParticipantFactory;
+#endif
+
 namespace CIAO
 {
   namespace DDS4CCM
@@ -26,12 +30,13 @@ namespace CIAO
 
       ::DDS::DomainParticipant_ptr
       RTI_DomainParticipantFactory_i::create_participant (::DDS::DomainId_t domain_id,
-                                                          const ::DDS::DomainParticipantQos & /*qos*/,
+                                                          const ::DDS::DomainParticipantQos & qos,
                                                           ::DDS::DomainParticipantListener_ptr a_listener,
                                                           ::DDS::StatusMask mask)
       {
         DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::create_participant");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::create_participant - "
                      "Creating domain participant for domain <%d>\n",
                      domain_id));
@@ -68,9 +73,16 @@ namespace CIAO
         rti_dp->set_impl (part);
 
         return retval._retn ();
+#else
+        return DDSDomainParticipantFactory::get_instance ()->
+          create_participant (domain_id,
+                              qos,
+                              a_listener,
+                              mask);
+#endif        
       }
 
-
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::DomainParticipant_ptr
       RTI_DomainParticipantFactory_i::create_participant_with_profile (
         ::DDS::DomainId_t domain_id,
@@ -143,11 +155,14 @@ namespace CIAO
             }
         }
       }
+#endif
 
       void
       RTI_DomainParticipantFactory_i::remove_participant (RTI_DomainParticipant_i * part)
       {
         DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::remove_participant");
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
                         this->dps_mutex_, CORBA::INTERNAL ());
 
@@ -172,6 +187,8 @@ namespace CIAO
                       "Don't delete participant since it's still used - ref_count <%d>\n",
                       part->_refcount_value ()));
           }
+#else
+#endif
       }
 
       ::DDS::ReturnCode_t
@@ -179,6 +196,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_DomainParticipantFactory_i::delete_participant");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_DomainParticipant_i *part = dynamic_cast< RTI_DomainParticipant_i * > (a_participant);
 
         if (!part)
@@ -192,14 +210,14 @@ namespace CIAO
 
         this->remove_participant (part);
 
-        DDS_ReturnCode_t retval = DDS_RETCODE_OK;
+        DDS::ReturnCode_t retval = DDS::RETCODE_OK;
 
         if (part->_refcount_value () == 1)
           {
             retval = DDSDomainParticipantFactory::get_instance ()->
                 delete_participant (part->get_impl ());
 
-            if (retval != DDS_RETCODE_OK)
+            if (retval != DDS::RETCODE_OK)
               {
                 DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipantFactory_i::delete_participant - "
                             "RTI delete_participant returned non-ok error code %C\n",
@@ -209,11 +227,16 @@ namespace CIAO
                               "Successfully deleted provided participant.\n"));
           }
         return retval;
+#else
+        return DDSDomainParticipantFactory::get_instance ()->
+                delete_participant (a_participant);
+#endif
       }
 
       ::DDS::DomainParticipant_ptr
       RTI_DomainParticipantFactory_i::lookup_participant (::DDS::DomainId_t domain_id)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_DomainParticipant_i (),
@@ -222,6 +245,9 @@ namespace CIAO
         RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
         rti_dp->set_impl (dp);
         return retval._retn ();
+#else
+        return DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id);
+#endif        
       }
 
       ::DDS::ReturnCode_t
@@ -256,6 +282,7 @@ namespace CIAO
         throw CORBA::NO_IMPLEMENT ();
       }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::ReturnCode_t
       RTI_DomainParticipantFactory_i::set_default_participant_qos_with_profile (
                                                           const char * library_name,
@@ -265,6 +292,15 @@ namespace CIAO
 
         return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos_with_profile (library_name, profile_name);
       }
+#endif
+      
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+      ::DDS::DomainParticipantFactory_ptr
+      RTI_DomainParticipantFactory_i::get_instance (void)
+      {
+        return 0;
+      }
+#endif
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
index f437534a7cd..4d2fd58c585 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
@@ -44,18 +44,24 @@ namespace CIAO
         virtual ~RTI_DomainParticipantFactory_i (void);
 
       public:
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+        virtual ::DDS::DomainParticipantFactory_ptr get_instance (void);
+#endif
+
         virtual
           ::DDS::DomainParticipant_ptr create_participant (::DDS::DomainId_t domain_id,
                                                            const ::DDS::DomainParticipantQos & qos,
                                                            ::DDS::DomainParticipantListener_ptr a_listener,
                                                            ::DDS::StatusMask mask);
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         virtual
           ::DDS::DomainParticipant_ptr create_participant_with_profile (::DDS::DomainId_t domain_id,
                                                           const char * library_name,
                                                           const char * profile_name,
                                                            ::DDS::DomainParticipantListener_ptr a_listener,
                                                            ::DDS::StatusMask mask);
+#endif
 
         virtual
           ::DDS::ReturnCode_t delete_participant (::DDS::DomainParticipant_ptr a_participant);
@@ -75,9 +81,12 @@ namespace CIAO
         virtual
           ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos);
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile(
                                                           const char * library_name,
                                                           const char * profile_name);
+#endif
+                                                          
       private:
         void remove_participant (RTI_DomainParticipant_i * part);
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
index ba7c84c030d..ccdcd70779c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
@@ -11,6 +11,11 @@
 
 #include "EntityFactoryQosPolicy.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DomainParticipantFactoryQos DDS_DomainParticipantFactoryQos;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DomainParticipantFactoryQos &ddsqos, const ::DDS_DomainParticipantFactoryQos & qos)
 {
@@ -34,5 +39,6 @@ operator>>= (const ::DDS::DomainParticipantFactoryQos &qos, ::DDS_DomainParticip
 {
   ddsqos.entity_factory <<= qos.entity_factory;
 }
+#endif
 
 #endif /* CIAO_RTI_DOMAINPARTICIPANTFACTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
index bdd50264478..eec3498ff05 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
@@ -40,6 +40,70 @@ namespace CIAO
         virtual ~RTI_DomainParticipantListener_i (void);
 
         ::DDS::DomainParticipantListener_ptr get_domainparticipantlistener (void);
+
+      virtual void
+      on_inconsistent_topic (
+        ::DDS::Topic_ptr,
+        const ::DDS::InconsistentTopicStatus & );
+
+      virtual void
+      on_requested_deadline_missed (
+        ::DDS::DataReader_ptr ,
+        const ::DDS::RequestedDeadlineMissedStatus & );
+
+      virtual void
+      on_requested_incompatible_qos (
+        ::DDS::DataReader_ptr ,
+        const ::DDS::RequestedIncompatibleQosStatus & );
+
+      virtual void
+      on_sample_rejected (
+        ::DDS::DataReader_ptr ,
+        const ::DDS::SampleRejectedStatus & );
+
+      virtual void
+      on_liveliness_changed (
+        ::DDS::DataReader_ptr ,
+        const ::DDS::LivelinessChangedStatus & );
+
+      virtual void
+      on_data_available (
+        ::DDS::DataReader_ptr );
+
+      virtual void
+      on_subscription_matched (
+        ::DDS::DataReader_ptr ,
+        const ::DDS::SubscriptionMatchedStatus & );
+
+      virtual void
+      on_sample_lost (
+        ::DDS::DataReader_ptr ,
+        const ::DDS::SampleLostStatus & );
+
+      virtual void
+      on_offered_deadline_missed (
+        ::DDS::DataWriter_ptr ,
+        const ::DDS::OfferedDeadlineMissedStatus & );
+
+      virtual void
+      on_offered_incompatible_qos (
+        ::DDS::DataWriter_ptr ,
+        const ::DDS::OfferedIncompatibleQosStatus & );
+
+      virtual void
+      on_liveliness_lost (
+        ::DDS::DataWriter_ptr ,
+        const ::DDS::LivelinessLostStatus & );
+
+      virtual void
+      on_publication_matched (
+        ::DDS::DataWriter_ptr ,
+        const ::DDS::PublicationMatchedStatus & );
+
+      virtual void
+      on_data_on_readers (
+        ::DDS::Subscriber_ptr );
+
       private:
         ::DDS::DomainParticipantListener_var impl_;
       };
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
index 8f05d12328e..8b76cc3d605 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
@@ -12,6 +12,11 @@
 #include "UserDataQosPolicy.h"
 #include "EntityFactoryQosPolicy.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DomainParticipantQos DDS_DomainParticipantQos;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DomainParticipantQos &ddsqos, const ::DDS_DomainParticipantQos & qos)
 {
@@ -38,5 +43,6 @@ operator>>= (const ::DDS::DomainParticipantQos &qos, ::DDS_DomainParticipantQos
   ddsqos.user_data <<= qos.user_data;
   ddsqos.entity_factory <<= qos.entity_factory;
 }
+#endif
 
 #endif /* CIAO_RTI_DOMAINPARTICIPANTQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
index f915b8d5ecd..cd3252356b0 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_DURABILITYQOSPOLICY_H
 #define CIAO_RTI_DURABILITYQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DurabilityQosPolicy DDS_DurabilityQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DurabilityQosPolicy &ddsqos, const ::DDS_DurabilityQosPolicy & qos)
 {
@@ -32,5 +37,6 @@ operator>>= (const ::DDS::DurabilityQosPolicy &qos, ::DDS_DurabilityQosPolicy &
 {
   ddsqos.kind = static_cast < ::DDS_DurabilityQosPolicyKind> (qos.kind);
 }
+#endif
 
 #endif /* CIAO_RTI_DURABILITYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
index 63215703ab6..5fbb0dd73b8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
@@ -11,6 +11,11 @@
 
 #include "Duration_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::DurabilityServiceQosPolicy DDS_DurabilityServiceQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DurabilityServiceQosPolicy &ddsqos, const ::DDS_DurabilityServiceQosPolicy & qos)
 {
@@ -54,5 +59,6 @@ operator>>= (const ::DDS::DurabilityServiceQosPolicy &qos, ::DDS_DurabilityServi
   ddsqos.max_instances = qos.max_instances;
   ddsqos.max_samples_per_instance = qos.max_samples_per_instance;
 }
+#endif
 
 #endif /* CIAO_RTI_DURABILITYSERVICEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
index 3460e8bcf6c..0488dd875e5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
@@ -10,10 +10,11 @@
 #ifndef CIAO_RTI_DURATION_T_H
 #define CIAO_RTI_DURATION_T_H
 
-#if defined (DDS_MAJOR_VERSION)
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::Duration_t DDS_Duration_t;
 #endif
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::Duration_t &ddsduration, const ::DDS_Duration_t & duration)
 {
@@ -21,14 +22,12 @@ operator<<= (::DDS::Duration_t &ddsduration, const ::DDS_Duration_t & duration)
   ddsduration.nanosec = duration.nanosec;
 }
 
-#if !defined (DDS_MAJOR_VERSION)
 inline void
 operator<<= (::DDS_Duration_t &ddsduration, const ::DDS::Duration_t & duration)
 {
   ddsduration.sec = duration.sec;
   ddsduration.nanosec = duration.nanosec;
 }
-#endif
 
 inline void
 operator>>= (const ::DDS_Duration_t &duration, ::DDS::Duration_t & ddsduration)
@@ -36,6 +35,7 @@ operator>>= (const ::DDS_Duration_t &duration, ::DDS::Duration_t & ddsduration)
   ddsduration.sec = duration.sec;
   ddsduration.nanosec = duration.nanosec;
 }
+#endif
 
 #endif /* CIAO_RTI_DURATION_T_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
index f7f0fe8ae5e..5074e14909b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_ENTITYFACTORYQOSPOLICY_H
 #define CIAO_RTI_ENTITYFACTORYQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::EntityFactoryQosPolicy DDS_EntityFactoryQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::EntityFactoryQosPolicy &ddsqos, const ::DDS_EntityFactoryQosPolicy & qos)
 {
@@ -32,5 +37,6 @@ operator>>= (const ::DDS::EntityFactoryQosPolicy &qos, ::DDS_EntityFactoryQosPol
 {
   ddsqos.autoenable_created_entities = qos.autoenable_created_entities;
 }
+#endif
 
 #endif /* CIAO_RTI_ENTITYFACTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
index 96cc5611f85..86a531443af 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_GROUPDATAQOSPOLICY_H
 #define CIAO_RTI_GROUPDATAQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::GroupDataQosPolicy DDS_GroupDataQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 // @todo here
 inline void
 operator<<= (::DDS::GroupDataQosPolicy &ddsqos, const ::DDS_GroupDataQosPolicy & qos)
@@ -41,5 +46,6 @@ operator>>= (const ::DDS::GroupDataQosPolicy &qos, ::DDS_GroupDataQosPolicy & dd
   ACE_UNUSED_ARG (qos);
 //  ddsqos.value <<= qos.value;
 }
+#endif
 
 #endif /* CIAO_RTI_GROUPDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
index 5c759852d35..43daab4ffbf 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_HISTORYQOSPOLICY_H
 #define CIAO_RTI_HISTORYQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::HistoryQosPolicy DDS_HistoryQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::HistoryQosPolicy &ddsqos, const ::DDS_HistoryQosPolicy & qos)
 {
@@ -36,5 +41,6 @@ operator>>= (const ::DDS::HistoryQosPolicy &qos, ::DDS_HistoryQosPolicy & ddsqos
   ddsqos.kind = static_cast < ::DDS_HistoryQosPolicyKind> (qos.kind);
   ddsqos.depth = qos.depth;
 }
+#endif
 
 #endif /* CIAO_RTI_HISTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
index d4e90922b9e..412879aabd9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
@@ -10,6 +10,11 @@
 #ifndef CIAO_RTI_INCONSISTENTTOPICSTATUS_H
 #define CIAO_RTI_INCONSISTENTTOPICSTATUS_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::InconsistentTopicStatus DDS_InconsistentTopicStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::InconsistentTopicStatus &ddsstatus, const ::DDS_InconsistentTopicStatus & status)
 {
@@ -17,14 +22,12 @@ operator<<= (::DDS::InconsistentTopicStatus &ddsstatus, const ::DDS_Inconsistent
   ddsstatus.total_count_change = status.total_count_change;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_InconsistentTopicStatus &ddsstatus, const ::DDS::InconsistentTopicStatus & status)
 {
   ddsstatus.total_count = status.total_count;
   ddsstatus.total_count_change = status.total_count_change;
 }
-#endif
 
 inline void
 operator>>= (const ::DDS_InconsistentTopicStatus &status, ::DDS::InconsistentTopicStatus & ddsstatus)
@@ -33,7 +36,6 @@ operator>>= (const ::DDS_InconsistentTopicStatus &status, ::DDS::InconsistentTop
   ddsstatus.total_count_change = status.total_count_change;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::InconsistentTopicStatus &status, ::DDS_InconsistentTopicStatus & ddsstatus)
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
index e027dd243ec..a17871bc6eb 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
@@ -16,6 +16,7 @@
 typedef ::DDS::InstanceHandleSeq DDS_InstanceHandleSeq;
 #endif
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 template <typename corbaseq, typename ddsseq>
 void convert_dds_to_corba_sequence(corbaseq & target, const ddsseq& source) {
   target.length (source.length ());
@@ -31,7 +32,6 @@ operator<<= (::DDS::InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS_Inst
   convert_dds_to_corba_sequence (ddsinstancehandleseqseq, instancehandleseq);
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS::InstanceHandleSeq & instancehandleseq)
 {
@@ -41,7 +41,6 @@ operator<<= (::DDS_InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS::Inst
       ddsinstancehandleseqseq[index] <<= instancehandleseq[index];
     }
 }
-#endif
 
 inline void
 operator>>= (const ::DDS_InstanceHandleSeq &instancehandle, ::DDS::InstanceHandleSeq & ddsinstancehandleseqseq)
@@ -53,7 +52,6 @@ operator>>= (const ::DDS_InstanceHandleSeq &instancehandle, ::DDS::InstanceHandl
     }
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::InstanceHandleSeq &instancehandle, ::DDS_InstanceHandleSeq & ddsinstancehandleseqseq)
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
index 68ce3c0d484..e66d3f3c61b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
@@ -11,6 +11,16 @@
 #define CIAO_RTI_INSTANCEHANDLE_T_H
 
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+#define DDS_INSTANCE_HANDLE_T_IN DDS_InstanceHandle_t
+#define DDS_INSTANCE_HANDLE_T_RETN DDS_InstanceHandle_t
+#endif
+
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+#define DDS_INSTANCE_HANDLE_T_IN ::DDS::InstanceHandle_t
+#define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle)
 {
@@ -92,13 +102,4 @@ operator!= (const ::DDS::InstanceHandle_t & ccm_instancehandle, const DDS_Instan
 }
 #endif
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::InstanceHandle_t DDS_InstanceHandle_t;
-inline void
-operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle)
-{
-  ddsinstancehandle = instancehandle;
-}
-#endif
-
 #endif /* CIAO_RTI_INSTANCEHANDLE_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
index 270efbe4dd7..2f374a057e7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
@@ -11,6 +11,11 @@
 
 #include "Duration_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::LatencyBudgetQosPolicy DDS_LatencyBudgetQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::LatencyBudgetQosPolicy &ddsqos, const ::DDS_LatencyBudgetQosPolicy & qos)
 {
@@ -34,5 +39,6 @@ operator>>= (const ::DDS::LatencyBudgetQosPolicy &qos, ::DDS_LatencyBudgetQosPol
 {
   ddsqos.duration <<= qos.duration;
 }
+#endif
 
 #endif /* CIAO_RTI_LATENCYBUDGETQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
index 92282613bf9..5093f4b96df 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
@@ -11,6 +11,11 @@
 
 #include "Duration_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::LifespanQosPolicy DDS_LifespanQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::LifespanQosPolicy &ddsqos, const ::DDS_LifespanQosPolicy & qos)
 {
@@ -34,5 +39,6 @@ operator>>= (const ::DDS::LifespanQosPolicy &qos, ::DDS_LifespanQosPolicy & ddsq
 {
   ddsqos.duration <<= qos.duration;
 }
+#endif
 
 #endif /* CIAO_RTI_LIFESPANQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
index ad814a486cf..b25544b2e48 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
@@ -12,6 +12,11 @@
 
 #include "InstanceHandle_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::LivelinessChangedStatus &ddsstatus, const ::DDS_LivelinessChangedStatus & status)
 {
@@ -22,7 +27,6 @@ operator<<= (::DDS::LivelinessChangedStatus &ddsstatus, const ::DDS_LivelinessCh
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_LivelinessChangedStatus &ddsstatus, const ::DDS::LivelinessChangedStatus & status)
 {
@@ -32,7 +36,6 @@ operator<<= (::DDS_LivelinessChangedStatus &ddsstatus, const ::DDS::LivelinessCh
   ddsstatus.not_alive_count_change = status.not_alive_count_change;
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
-#endif
 
 inline void
 operator>>= (const ::DDS_LivelinessChangedStatus &status, ::DDS::LivelinessChangedStatus & ddsstatus)
@@ -44,7 +47,6 @@ operator>>= (const ::DDS_LivelinessChangedStatus &status, ::DDS::LivelinessChang
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::LivelinessChangedStatus &status, ::DDS_LivelinessChangedStatus & ddsstatus)
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
index 926e39d8f08..8a7605c7f1d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
@@ -10,6 +10,11 @@
 #ifndef CIAO_RTI_LIVELINESSLOSTSTATUS_H
 #define CIAO_RTI_LIVELINESSLOSTSTATUS_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::LivelinessLostStatus &ddsstatus, const ::DDS_LivelinessLostStatus & status)
 {
@@ -37,5 +42,6 @@ operator>>= (const ::DDS::LivelinessLostStatus &status, ::DDS_LivelinessLostStat
   ddsstatus.total_count = status.total_count;
   ddsstatus.total_count_change = status.total_count_change;
 }
+#endif
 
 #endif /* CIAO_RTI_LIVELINESSLOSTSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
index 60c1c658d41..895e4d09b44 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
@@ -11,6 +11,11 @@
 
 #include "Duration_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::LivelinessQosPolicy DDS_LivelinessQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::LivelinessQosPolicy &ddsqos, const ::DDS_LivelinessQosPolicy & qos)
 {
@@ -38,5 +43,6 @@ operator>>= (const ::DDS::LivelinessQosPolicy &qos, ::DDS_LivelinessQosPolicy &
   ddsqos.kind = static_cast < ::DDS_LivelinessQosPolicyKind> (qos.kind);
   ddsqos.lease_duration <<= qos.lease_duration;
 }
+#endif
 
 #endif /* CIAO_RTI_LIVELINESSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
index 255b22b4c71..7a301519e91 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
@@ -12,6 +12,11 @@
 
 #include "InstanceHandle_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::OfferedDeadlineMissedStatus &ddsstatus, const ::DDS_OfferedDeadlineMissedStatus & status)
 {
@@ -43,5 +48,6 @@ operator>>= (const ::DDS::OfferedDeadlineMissedStatus &status, ::DDS_OfferedDead
   ddsstatus.total_count_change = status.total_count_change;
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
+#endif
 
 #endif /* CIAO_RTI_OFFEREDDEADLINEMISSEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
index 3021d2ff935..12a1d37db47 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
@@ -12,6 +12,11 @@
 
 #include "QosPolicyCountSeq.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::OfferedIncompatibleQosStatus &ddsstatus, const ::DDS_OfferedIncompatibleQosStatus & status)
 {
@@ -47,5 +52,6 @@ operator>>= (const ::DDS::OfferedIncompatibleQosStatus &status, ::DDS_OfferedInc
   ddsstatus.last_policy_id = static_cast <DDS_QosPolicyId_t>(status.last_policy_id);
   ddsstatus.policies <<= status.policies;
 }
+#endif
 
 #endif /* CIAO_RTI_OFFEREDINCOMPATIBLEQOSSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
index 9afc00e9a4f..eb3764c9efe 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_OWNERSHIPQOSPOLICY_H
 #define CIAO_RTI_OWNERSHIPQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::OwnershipQosPolicy DDS_OwnershipQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::OwnershipQosPolicy &ddsqos, const ::DDS_OwnershipQosPolicy & qos)
 {
@@ -32,5 +37,6 @@ operator>>= (const ::DDS::OwnershipQosPolicy &qos, ::DDS_OwnershipQosPolicy & dd
 {
   ddsqos.kind = static_cast < ::DDS_OwnershipQosPolicyKind> (qos.kind);
 }
+#endif
 
 #endif /* CIAO_RTI_OWNERSHIPQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
index 125fb0a3c09..3345c0c99c0 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_OWNERSHIPSTRENGTHQOSPOLICY_H
 #define CIAO_RTI_OWNERSHIPSTRENGTHQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::OwnershipStrengthQosPolicy DDS_OwnershipStrengthQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::OwnershipStrengthQosPolicy &ddsqos, const ::DDS_OwnershipStrengthQosPolicy & qos)
 {
@@ -32,5 +37,6 @@ operator>>= (const ::DDS::OwnershipStrengthQosPolicy &qos, ::DDS_OwnershipStreng
 {
   ddsqos.value = qos.value;
 }
+#endif
 
 #endif /* CIAO_RTI_OWNERSHIPSTRENGTHQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
index 1b67f6a9b40..2f7e71be1f8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
@@ -9,8 +9,11 @@
 #ifndef CIAO_RTI_PARTITIONQOSPOLICY_H
 #define CIAO_RTI_PARTITIONQOSPOLICY_H
 
-/// @todo
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::PartitionQosPolicy DDS_PartitionQosPolicy;
+#endif
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::PartitionQosPolicy &ddsqos, const ::DDS_PartitionQosPolicy & qos)
 {
@@ -42,5 +45,6 @@ operator>>= (const ::DDS::PartitionQosPolicy &qos, ::DDS_PartitionQosPolicy & dd
   ACE_UNUSED_ARG (qos);
 //  ddsqos.name <<= qos.name;
 }
+#endif
 
 #endif /* CIAO_RTI_PARTITIONQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
index 2be0c9005a1..992f08bb832 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_PRESENTATIONQOSPOLICY_H
 #define CIAO_RTI_PRESENTATIONQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::PresentationQosPolicy DDS_PresentationQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::PresentationQosPolicy &ddsqos, const ::DDS_PresentationQosPolicy & qos)
 {
@@ -36,5 +41,6 @@ operator>>= (const ::DDS::PresentationQosPolicy &qos, ::DDS_PresentationQosPolic
   ddsqos.coherent_access = qos.coherent_access;
   ddsqos.ordered_access = qos.ordered_access;
 }
+#endif
 
 #endif /* CIAO_RTI_PRESENTATIONQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
index fa967fcbee8..972cabc140b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
@@ -12,6 +12,11 @@
 
 #include "InstanceHandle_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::PublicationMatchedStatus &ddsstatus, const ::DDS_PublicationMatchedStatus & status)
 {
@@ -51,5 +56,6 @@ operator>>= (const ::DDS::PublicationMatchedStatus &status, ::DDS_PublicationMat
   ddsstatus.current_count_change = status.current_count_change;
   ddsstatus.last_subscription_handle <<= status.last_subscription_handle;
 }
+#endif
 
 #endif /* CIAO_RTI_PUBLICATIONMATCHEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
index 9c03d64a32d..8d9a8c998ef 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
@@ -34,12 +34,13 @@ namespace CIAO
 
       ::DDS::DataWriter_ptr
       RTI_Publisher_i::create_datawriter (::DDS::Topic_ptr a_topic,
-                                          const ::DDS::DataWriterQos & /*qos*/,
+                                          const ::DDS::DataWriterQos & qos,
                                           ::DDS::DataWriterListener_ptr a_listener,
                                           ::DDS::StatusMask mask)
       {
         DDS4CCM_TRACE ("RTI_Publisher_i::create_datawriter");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_Topic_i * topic = dynamic_cast < RTI_Topic_i * > (a_topic);
 
         if (!topic)
@@ -81,8 +82,16 @@ namespace CIAO
         dw->set_impl (rti_dw);
 
         return retval._retn ();
+#else
+        return this->impl ()->create_datawriter (
+                                                              a_topic,
+                                                              qos,
+                                                              a_listener,
+                                                              mask);
+#endif
       }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::DataWriter_ptr
       RTI_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic,
                                           const char* library_name,
@@ -134,12 +143,14 @@ namespace CIAO
 
         return retval._retn ();
       }
+#endif
 
       ::DDS::ReturnCode_t
       RTI_Publisher_i::delete_datawriter (::DDS::DataWriter_ptr a_datawriter)
       {
         DDS4CCM_TRACE ("RTI_Publisher_i::delete_datawriter");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_DataWriter_i *top = dynamic_cast< RTI_DataWriter_i *> (a_datawriter);
 
         if (top == 0)
@@ -164,11 +175,15 @@ namespace CIAO
                           "Provided datawriter successfully deleted\n"));
 
         return retval;
+#else
+        return this->impl ()->delete_datawriter (a_datawriter);
+#endif
       }
 
       ::DDS::DataWriter_ptr
       RTI_Publisher_i::lookup_datawriter (const char * impl_name)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_DataWriter_i (),
@@ -177,6 +192,9 @@ namespace CIAO
         RTI_DataWriter_i *rti_dw = dynamic_cast< RTI_DataWriter_i * > (retval.in ());
         rti_dw->set_impl (dw);
         return retval._retn ();
+#else
+        return this->impl ()->lookup_datawriter (impl_name);
+#endif
       }
 
       ::DDS::ReturnCode_t
@@ -205,14 +223,18 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_Publisher_i::set_listener");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_PublisherListener_i *rti_impl_list  = 0;
-       if (!CORBA::is_nil (a_listener))
+        if (!CORBA::is_nil (a_listener))
           {
             ACE_NEW_THROW_EX (rti_impl_list,
                               RTI_PublisherListener_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::PublisherListener_ptr
@@ -220,6 +242,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_Publisher_i::get_listener");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDSPublisherListener *rti_pub_list = this->impl ()->get_listener ();
         RTI_PublisherListener_i *list_proxy = dynamic_cast <RTI_PublisherListener_i *> (rti_pub_list);
         if (!list_proxy)
@@ -229,6 +252,9 @@ namespace CIAO
             return ::DDS::PublisherListener::_nil ();
           }
         return list_proxy->get_publisher_listener ();
+#else
+        return this->impl ()->get_listener ();
+#endif
       }
 
       ::DDS::ReturnCode_t
@@ -258,15 +284,20 @@ namespace CIAO
       ::DDS::ReturnCode_t
       RTI_Publisher_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_Duration_t rti_dds_duration;
         rti_dds_duration <<= max_wait;
         return this->impl ()->wait_for_acknowledgments (rti_dds_duration);
+#else
+        return this->impl ()->wait_for_acknowledgments (max_wait);
+#endif
       }
 
       ::DDS::DomainParticipant_ptr
       RTI_Publisher_i::get_participant (void)
       {
         DDS4CCM_TRACE ("RTI_Publisher_i::get_participant");
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_DomainParticipant_i (),
@@ -276,6 +307,9 @@ namespace CIAO
         RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
         rti_dp->set_impl (p);
         return retval._retn ();
+#else
+        return this->impl ()->get_participant ();
+#endif
       }
 
       ::DDS::ReturnCode_t
@@ -309,6 +343,7 @@ namespace CIAO
       ::DDS::StatusCondition_ptr
       RTI_Publisher_i::get_statuscondition (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_StatusCondition_i (),
@@ -318,6 +353,9 @@ namespace CIAO
         RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
         rti_sc->set_impl (sc);
         return retval._retn ();
+#else
+        return this->impl ()->get_statuscondition ();
+#endif
       }
 
       ::DDS::StatusMask
@@ -329,10 +367,14 @@ namespace CIAO
       ::DDS::InstanceHandle_t
       RTI_Publisher_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
       }
 
       DDSPublisher *
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
index 84201688557..47b62bea608 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
@@ -35,6 +35,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_PublisherListener_i::on_offered_deadline_missed");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::OfferedDeadlineMissedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
@@ -42,6 +43,9 @@ namespace CIAO
         RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
         dw->set_impl (writer);
         this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus);
+#else
+        this->impl_->on_offered_deadline_missed (writer, status);
+#endif        
       }
 
       void
@@ -51,6 +55,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_PublisherListener_i::on_offered_incompatible_qos");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::OfferedIncompatibleQosStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
@@ -58,6 +63,9 @@ namespace CIAO
         RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
         dw->set_impl (writer);
         this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus);
+#else
+        this->impl_->on_offered_incompatible_qos (writer, status);
+#endif        
       }
 
       void
@@ -67,6 +75,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_PublisherListener_i::on_liveliness_lost");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::LivelinessLostStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
@@ -74,6 +83,9 @@ namespace CIAO
         RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
         dw->set_impl (writer);
         this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus);
+#else
+        this->impl_->on_liveliness_lost (writer, status);
+#endif        
       }
 
       void
@@ -83,6 +95,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_PublisherListener_i::on_publication_matched");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::PublicationMatchedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
@@ -90,6 +103,9 @@ namespace CIAO
         RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
         dw->set_impl (writer);
         this->impl_->on_publication_matched (dds_writer.in (), ddsstatus);
+#else
+        this->impl_->on_publication_matched (writer, status);
+#endif        
       }
 
       ::DDS::PublisherListener_ptr
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
index 0998c1c0dc9..2bee931dace 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
@@ -24,6 +24,10 @@
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::PublisherListener DDSPublisherListener;
 typedef ::DDS::DataWriter DDSDataWriter;
+typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus;
+typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus;
+typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus;
+typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus;
 #endif
 
 #include "tao/LocalObject.h"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
index 25244282b6b..d79631645f1 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
@@ -14,6 +14,11 @@
 #include "GroupDataQosPolicy.h"
 #include "EntityFactoryQosPolicy.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::PublisherQos DDS_PublisherQos;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::PublisherQos &ddsqos, const ::DDS_PublisherQos & qos)
 {
@@ -49,5 +54,6 @@ operator>>= (const ::DDS::PublisherQos &qos, ::DDS_PublisherQos & ddsqos)
   ddsqos.group_data <<= qos.group_data;
   ddsqos.entity_factory <<= qos.entity_factory;
 }
+#endif
 
 #endif /* CIAO_RTI_PUBLISHERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
index 098aaf91242..7e19f1b8fc1 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
@@ -14,25 +14,23 @@
 typedef ::DDS::QosPolicyCountSeq DDS_QosPolicyCountSeq;
 #endif
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::QosPolicyCountSeq &/*ddsstatus*/, const ::DDS_QosPolicyCountSeq & /*status*/)
 {
   // todo
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_QosPolicyCountSeq &/*ddsstatus*/, const ::DDS::QosPolicyCountSeq & /*status*/)
 {
 }
-#endif
 
 inline void
 operator>>= (const ::DDS_QosPolicyCountSeq &/*status*/, ::DDS::QosPolicyCountSeq & /*ddsstatus*/)
 {
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::QosPolicyCountSeq &/*status*/, ::DDS_QosPolicyCountSeq & /*ddsstatus*/)
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
index 1aa87669f46..853f4fb1f60 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
@@ -51,6 +51,7 @@ namespace CIAO
       ::DDS::DataReader_ptr
       RTI_QueryCondition_i::get_datareader (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
         ACE_NEW_THROW_EX (dds_reader,
                           RTI_DataReader_i (),
@@ -60,32 +61,47 @@ namespace CIAO
         rti_dr->set_impl (reader);
 
         return dds_reader._retn ();
+#else
+        return this->impl ()->get_datareader ();
+#endif        
       }
 
       char *
       RTI_QueryCondition_i::get_query_expression (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         return ::CORBA::string_dup (this->impl ()->get_query_expression ());
+#else
+        return this->impl ()->get_query_expression ();
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_QueryCondition_i::get_query_parameters (
         ::DDS::StringSeq & query_parameters)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_StringSeq parameters;
         ::DDS::ReturnCode_t retval = this->impl ()->get_query_parameters (
                                                            parameters);
         query_parameters <<= parameters;
         return retval;
+#else
+        return this->impl ()->get_query_parameters (query_parameters);
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_QueryCondition_i::set_query_parameters (
         const ::DDS::StringSeq & query_parameters)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_StringSeq parameters;
         parameters <<= query_parameters;
         return this->impl ()->set_query_parameters (parameters);
+#else
+        return this->impl ()->set_query_parameters (query_parameters);
+#endif        
       }
 
       DDSQueryCondition *
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
index abc9363bfc3..d5f32c0b62d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_READERDATALIFECYCLEQOSPOLICY_H
 #define CIAO_RTI_READERDATALIFECYCLEQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::ReaderDataLifecycleQosPolicy DDS_ReaderDataLifecycleQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS_ReaderDataLifecycleQosPolicy & qos)
 {
@@ -36,5 +41,6 @@ operator>>= (const ::DDS::ReaderDataLifecycleQosPolicy &qos, ::DDS_ReaderDataLif
   ddsqos.autopurge_nowriter_samples_delay <<= qos.autopurge_nowriter_samples_delay;
   ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay;
 }
+#endif
 
 #endif /* CIAO_RTI_READERDATALIFECYCLEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
index 1a114e4c3a4..9d3bf4d52d3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
@@ -11,6 +11,11 @@
 
 #include "Duration_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::ReliabilityQosPolicy DDS_ReliabilityQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::ReliabilityQosPolicy &ddsqos, const ::DDS_ReliabilityQosPolicy & qos)
 {
@@ -38,5 +43,6 @@ operator>>= (const ::DDS::ReliabilityQosPolicy &qos, ::DDS_ReliabilityQosPolicy
   ddsqos.kind = static_cast < ::DDS_ReliabilityQosPolicyKind> (qos.kind);
   ddsqos.max_blocking_time <<= qos.max_blocking_time;
 }
+#endif
 
 #endif /* CIAO_RTI_RELIABILITYSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
index 66b7a0c63da..5445008aff6 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
@@ -12,6 +12,11 @@
 
 #include "InstanceHandle_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::RequestedDeadlineMissedStatus &ddsstatus, const ::DDS_RequestedDeadlineMissedStatus & status)
 {
@@ -20,7 +25,6 @@ operator<<= (::DDS::RequestedDeadlineMissedStatus &ddsstatus, const ::DDS_Reques
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_RequestedDeadlineMissedStatus &ddsstatus, const ::DDS::RequestedDeadlineMissedStatus & status)
 {
@@ -28,7 +32,6 @@ operator<<= (::DDS_RequestedDeadlineMissedStatus &ddsstatus, const ::DDS::Reques
   ddsstatus.total_count_change = status.total_count_change;
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
-#endif
 
 inline void
 operator>>= (const ::DDS_RequestedDeadlineMissedStatus &status, ::DDS::RequestedDeadlineMissedStatus & ddsstatus)
@@ -38,7 +41,6 @@ operator>>= (const ::DDS_RequestedDeadlineMissedStatus &status, ::DDS::Requested
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::RequestedDeadlineMissedStatus &status, ::DDS_RequestedDeadlineMissedStatus & ddsstatus)
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
index 20b27dc1262..30281c0abbe 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
@@ -12,6 +12,11 @@
 
 #include "QosPolicyCountSeq.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::RequestedIncompatibleQosStatus &ddsstatus, const ::DDS_RequestedIncompatibleQosStatus & status)
 {
@@ -21,7 +26,6 @@ operator<<= (::DDS::RequestedIncompatibleQosStatus &ddsstatus, const ::DDS_Reque
   ddsstatus.policies <<= status.policies;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_RequestedIncompatibleQosStatus &ddsstatus, const ::DDS::RequestedIncompatibleQosStatus & status)
 {
@@ -30,7 +34,6 @@ operator<<= (::DDS_RequestedIncompatibleQosStatus &ddsstatus, const ::DDS::Reque
   ddsstatus.last_policy_id = static_cast <DDS_QosPolicyId_t>(status.last_policy_id);
   ddsstatus.policies <<= status.policies;
 }
-#endif
 
 inline void
 operator>>= (const ::DDS_RequestedIncompatibleQosStatus &status, ::DDS::RequestedIncompatibleQosStatus & ddsstatus)
@@ -41,7 +44,6 @@ operator>>= (const ::DDS_RequestedIncompatibleQosStatus &status, ::DDS::Requeste
   ddsstatus.policies <<= status.policies;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::RequestedIncompatibleQosStatus &status, ::DDS_RequestedIncompatibleQosStatus & ddsstatus)
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
index 1f41063358a..b0405998b0f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_RESOURCELIMITSQOSPOLICY_H
 #define CIAO_RTI_RESOURCELIMITSQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::ResourceLimitsQosPolicy DDS_ResourceLimitsQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::ResourceLimitsQosPolicy &ddsqos, const ::DDS_ResourceLimitsQosPolicy & qos)
 {
@@ -40,5 +45,6 @@ operator>>= (const ::DDS::ResourceLimitsQosPolicy &qos, ::DDS_ResourceLimitsQosP
   ddsqos.max_instances = qos.max_instances;
   ddsqos.max_samples_per_instance = qos.max_samples_per_instance;
 }
+#endif
 
 #endif /* CIAO_RTI_RESOURCELIMITSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
index 37a8084781f..8d3d816576d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
@@ -13,7 +13,7 @@
 #include "Time_t.h"
 #include "InstanceHandle_t.h"
 
-#if defined (DDS_MAJOR_VERSION)
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::SampleStateKind DDS_SampleStateKind;
 typedef ::DDS::SampleInfo DDS_SampleInfo;
 #endif
@@ -34,11 +34,19 @@ operator<<= (::CCM_DDS::AccessStatus & access_status, const ::DDS_SampleStateKin
 inline void
 operator<<= (::CCM_DDS::ReadInfo& ccm_dds_readinfo, const ::DDS_SampleInfo& sample_info)
 {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
   ccm_dds_readinfo.source_timestamp <<= sample_info.source_timestamp;
+#else
+  ccm_dds_readinfo.source_timestamp = sample_info.source_timestamp;
+#endif  
   ccm_dds_readinfo.access_status <<= sample_info.sample_state;
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
   ccm_dds_readinfo.instance_handle <<= sample_info.instance_handle;
+#else
+  ccm_dds_readinfo.instance_handle = sample_info.instance_handle;
+#endif
 
-  if (sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE && 
+  if (sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE &&
       sample_info.view_state == ::DDS::NEW_VIEW_STATE)
     {
       // Instance_status new
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
index 4e51ef3e61a..096d92e1d0a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
@@ -10,6 +10,11 @@
 #ifndef CIAO_RTI_SAMPLELOSTSTATUS_H
 #define CIAO_RTI_SAMPLELOSTSTATUS_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::SampleLostStatus DDS_SampleLostStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::SampleLostStatus &ddsstatus, const ::DDS_SampleLostStatus & status)
 {
@@ -23,6 +28,7 @@ operator>>= (const ::DDS_SampleLostStatus &status, ::DDS::SampleLostStatus & dds
   ddsstatus.total_count = status.total_count;
   ddsstatus.total_count_change = status.total_count_change;
 }
+#endif
 
 #endif /* CIAO_RTI_SAMPLELOSTSTATUS_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
index d3605e33c0e..2f2d419e990 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
@@ -6,12 +6,17 @@
  *
  * Wrapper facade for NDDS.
  */
- 
+
 #ifndef CIAO_RTI_SAMPLEREJECTEDSTATUS_H
 #define CIAO_RTI_SAMPLEREJECTEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::SampleRejectedStatus &ddsstatus, const ::DDS_SampleRejectedStatus & status)
 {
@@ -21,7 +26,6 @@ operator<<= (::DDS::SampleRejectedStatus &ddsstatus, const ::DDS_SampleRejectedS
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_SampleRejectedStatus &ddsstatus, const ::DDS::SampleRejectedStatus & status)
 {
@@ -30,7 +34,6 @@ operator<<= (::DDS_SampleRejectedStatus &ddsstatus, const ::DDS::SampleRejectedS
   ddsstatus.last_reason = static_cast < ::DDS_SampleRejectedStatusKind> (status.last_reason);
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
-#endif
 
 inline void
 operator>>= (const ::DDS_SampleRejectedStatus &status, ::DDS::SampleRejectedStatus & ddsstatus)
@@ -41,14 +44,13 @@ operator>>= (const ::DDS_SampleRejectedStatus &status, ::DDS::SampleRejectedStat
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::SampleRejectedStatus &status, ::DDS_SampleRejectedStatus & ddsstatus)
 {
   ddsstatus.total_count = status.total_count;
   ddsstatus.total_count_change = status.total_count_change;
   ddsstatus.last_reason = static_cast < ::DDS_SampleRejectedStatusKind> (status.last_reason);
-  ddsstatus.last_instance_handle <<= status.last_instance_handle; 
+  ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
 #endif
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
index 3017181bae3..613137c4433 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
@@ -14,6 +14,7 @@ typedef ::DDS::StringSeq DDS_StringSeq;
 typedef long DDS_Long;
 #endif
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::StringSeq & string_seq, const ::DDS_StringSeq & dds_string_seq)
 {
@@ -24,7 +25,6 @@ operator<<= (::DDS::StringSeq & string_seq, const ::DDS_StringSeq & dds_string_s
     }
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_StringSeq & dds_string_seq, const ::DDS::StringSeq & string_seq)
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
index c4148f99cba..19b187c8b6f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
@@ -60,10 +60,14 @@ namespace CIAO
       ::DDS::InstanceHandle_t
       RTI_Subscriber_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        
       }
 
       DDSDataReader *
@@ -72,7 +76,11 @@ namespace CIAO
                     DDSDataReaderListener * rti_drl,
                     ::DDS::StatusMask mask)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT;
+#else
+        ::DDS::DataReaderQos rti_qos;
+#endif        
         return this->impl ()->create_datareader (topic,
                                                  rti_qos,
                                                  rti_drl,
@@ -85,13 +93,18 @@ namespace CIAO
                     DDSDataReaderListener * rti_drl,
                     ::DDS::StatusMask mask)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT;
+#else
+        DDS::DataReaderQos rti_qos;
+#endif        
         return this->impl ()->create_datareader (topic,
                                                  rti_qos,
                                                  rti_drl,
                                                  mask);
       }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       DDSDataReader *
       RTI_Subscriber_i::create_datareader_with_profile (
                     DDSContentFilteredTopic * topic,
@@ -106,7 +119,9 @@ namespace CIAO
                                                               rti_drl,
                                                               mask);
       }
+#endif
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       DDSDataReader *
       RTI_Subscriber_i::create_datareader_with_profile (
                     DDSTopic * topic,
@@ -121,6 +136,7 @@ namespace CIAO
                                                               rti_drl,
                                                               mask);
       }
+#endif
 
       ::DDS::DataReader_ptr
       RTI_Subscriber_i::create_datareader (
@@ -338,7 +354,7 @@ namespace CIAO
         ::DDS::SubscriberQos & /*qos*/)
       {
         DDS_SubscriberQos rti_impl_qos;
-        DDS_ReturnCode_t const rti_retcode = this->impl ()->get_qos (rti_impl_qos);
+        ::DDS::ReturnCode_t const rti_retcode = this->impl ()->get_qos (rti_impl_qos);
         /*qos.presentation = rti_impl_qos.presentation;
         qos.partition = rti_impl_qos.partition;
         qos.group_data = rti_impl_qos.group_data;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
index d40d7e99910..7120fdc2fba 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
@@ -26,6 +26,7 @@
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::Subscriber DDSSubscriber;
 typedef ::DDS::DataReaderListener DDSDataReaderListener;
+typedef ::DDS::DataReader DDSDataReader;
 typedef ::DDS::ContentFilteredTopic DDSContentFilteredTopic;
 typedef ::DDS::Topic DDSTopic;
 #endif
@@ -66,6 +67,7 @@ namespace CIAO
           ::DDS::DataReaderListener_ptr a_listener,
           ::DDS::StatusMask mask);
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         virtual ::DDS::DataReader_ptr
         create_datareader_with_profile (
           ::DDS::TopicDescription_ptr a_topic,
@@ -73,6 +75,7 @@ namespace CIAO
           const char *profile_name,
           ::DDS::DataReaderListener_ptr a_listener,
           ::DDS::StatusMask mask);
+#endif
 
         virtual ::DDS::ReturnCode_t
         delete_datareader (
@@ -154,6 +157,7 @@ namespace CIAO
           DDSDataReaderListener * rti_drl,
           ::DDS::StatusMask mask);
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDSDataReader *
         create_datareader_with_profile (
           DDSContentFilteredTopic * topic,
@@ -161,7 +165,9 @@ namespace CIAO
           const char *profile_name,
           DDSDataReaderListener * rti_drl,
           ::DDS::StatusMask mask);
+#endif
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDSDataReader *
         create_datareader_with_profile (
           DDSTopic * topic,
@@ -169,6 +175,7 @@ namespace CIAO
           const char *profile_name,
           DDSDataReaderListener * rti_drl,
           ::DDS::StatusMask mask);
+#endif          
       };
     }
   }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
index 0b301f40630..42ea79c421e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
@@ -34,11 +34,15 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_data_on_readers");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::Subscriber_var sub = ::DDS::Subscriber::_nil ();
         ACE_NEW (sub, RTI_Subscriber_i ());
         RTI_Subscriber_i *s = dynamic_cast < RTI_Subscriber_i *> (sub.in ());
         s->set_impl (the_subscriber);
         this->impl_->on_data_on_readers (sub.in ());
+#else
+        this->impl_->on_data_on_readers (the_subscriber);
+#endif        
         the_subscriber->notify_datareaders ();
       }
 
@@ -49,14 +53,17 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_requested_deadline_missed");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::RequestedDeadlineMissedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
         ACE_NEW (dds_reader, RTI_DataReader_i ());
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
-
         this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_requested_deadline_missed (the_reader, status);
+#endif        
       }
 
       void
@@ -66,6 +73,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_requested_incompatible_qos");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::RequestedIncompatibleQosStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -73,6 +81,9 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_requested_incompatible_qos (the_reader, status);
+#endif        
       }
 
       void
@@ -82,6 +93,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_sample_rejected");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::SampleRejectedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -89,6 +101,9 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_sample_rejected (the_reader, status);
+#endif        
       }
 
       void
@@ -98,6 +113,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_liveliness_changed");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::LivelinessChangedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -105,6 +121,9 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_liveliness_changed (the_reader, status);
+#endif        
       }
 
       void
@@ -113,11 +132,15 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_data_available");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
         ACE_NEW (dds_reader, RTI_DataReader_i ());
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_data_available (dds_reader.in ());
+#else
+        this->impl_->on_data_available (the_reader);
+#endif        
       }
 
       void
@@ -127,6 +150,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_subscription_matched");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::SubscriptionMatchedStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -134,6 +158,9 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_subscription_matched (the_reader, status);
+#endif        
       }
 
       void
@@ -143,6 +170,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_SubscriberListener_i::on_sample_lost");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::SampleLostStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
@@ -150,6 +178,9 @@ namespace CIAO
         RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
         rti_dr->set_impl (the_reader);
         this->impl_->on_sample_lost (dds_reader.in (), ddsstatus);
+#else
+        this->impl_->on_sample_lost (the_reader, status);
+#endif        
       }
 
       ::DDS::SubscriberListener_ptr
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
index f832a739308..afac9aaf915 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
@@ -22,6 +22,13 @@
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::SubscriberListener DDSSubscriberListener;
 typedef ::DDS::DataReader DDSDataReader;
+typedef ::DDS::Subscriber DDSSubscriber;
+typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus;
+typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus;
+typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus;
+typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus;
+typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus;
+typedef ::DDS::SampleLostStatus DDS_SampleLostStatus;
 #endif
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
index 866e0e2d3ab..c16c7b61542 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
@@ -11,6 +11,11 @@
 
 #include "EntityFactoryQosPolicy.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::SubscriberQos DDS_SubscriberQos;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::SubscriberQos &ddsqos, const ::DDS_SubscriberQos & qos)
 {
@@ -46,5 +51,6 @@ operator>>= (const ::DDS::SubscriberQos &qos, ::DDS_SubscriberQos & ddsqos)
   ddsqos.group_data <<= qos.group_data;
   ddsqos.entity_factory <<= qos.entity_factory;
 }
+#endif
 
 #endif /* CIAO_RTI_SUBSCRIBERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
index 0970210a80d..b5c870524f3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
@@ -12,6 +12,11 @@
 
 #include "InstanceHandle_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::SubscriptionMatchedStatus &ddsstatus, const ::DDS_SubscriptionMatchedStatus & status)
 {
@@ -22,7 +27,6 @@ operator<<= (::DDS::SubscriptionMatchedStatus &ddsstatus, const ::DDS_Subscripti
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS_SubscriptionMatchedStatus &ddsstatus, const ::DDS::SubscriptionMatchedStatus & status)
 {
@@ -32,7 +36,6 @@ operator<<= (::DDS_SubscriptionMatchedStatus &ddsstatus, const ::DDS::Subscripti
   ddsstatus.current_count_change = status.current_count_change;
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
-#endif
 
 inline void
 operator>>= (const ::DDS_SubscriptionMatchedStatus &status, ::DDS::SubscriptionMatchedStatus & ddsstatus)
@@ -44,7 +47,6 @@ operator>>= (const ::DDS_SubscriptionMatchedStatus &status, ::DDS::SubscriptionM
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator>>= (const ::DDS::SubscriptionMatchedStatus &status, ::DDS_SubscriptionMatchedStatus & ddsstatus)
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
index 0e4bac3fb77..542cbc72caa 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
@@ -11,6 +11,11 @@
 
 #include "Duration_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::TimeBasedFilterQosPolicy DDS_TimeBasedFilterQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::TimeBasedFilterQosPolicy &ddsqos, const ::DDS_TimeBasedFilterQosPolicy & qos)
 {
@@ -34,5 +39,6 @@ operator>>= (const ::DDS::TimeBasedFilterQosPolicy &qos, ::DDS_TimeBasedFilterQo
 {
   ddsqos.minimum_separation <<= qos.minimum_separation;
 }
+#endif
 
 #endif /* CIAO_RTI_TIMEBASEDFILTERQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h
index cc72544b0d7..1ebb682c1b9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h
@@ -45,6 +45,4 @@ operator>>= (const ::ACE_Time_Value & ace_time, ::DDS::Time_t &dds_time)
   dds_time.nanosec = ace_time.usec () * 1000;
 }
 
-
-
 #endif /* DDS4CCM_TIME_UTILITIES_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
index f71f776ef7b..da7d447206b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
@@ -10,10 +10,11 @@
 #ifndef CIAO_RTI_TIME_T_H
 #define CIAO_RTI_TIME_T_H
 
-#if defined (DDS_MAJOR_VERSION)
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::Time_t DDS_Time_t;
 #endif
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::Time_t &ddstime, const ::DDS_Time_t & time)
 {
@@ -21,14 +22,12 @@ operator<<= (::DDS::Time_t &ddstime, const ::DDS_Time_t & time)
   ddstime.nanosec = time.nanosec;
 }
 
-#if !defined (DDS_MAJOR_VERSION)
 inline void
 operator<<= (::DDS_Time_t &ddstime, const ::DDS::Time_t & time)
 {
   ddstime.sec = time.sec;
   ddstime.nanosec = time.nanosec;
 }
-#endif
 
 inline void
 operator>>= (const ::DDS_Time_t &time, ::DDS::Time_t & ddstime)
@@ -36,6 +35,7 @@ operator>>= (const ::DDS_Time_t &time, ::DDS::Time_t & ddstime)
   ddstime.sec = time.sec;
   ddstime.nanosec = time.nanosec;
 }
+#endif
 
 #endif /* CIAO_RTI_TIME_T_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
index 475cb7ac087..3c17b9aa68a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
@@ -27,18 +27,26 @@ namespace CIAO
       ::DDS::ReturnCode_t
       RTI_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
       RTI_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
@@ -47,6 +55,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_Topic_i::set_listener");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         RTI_TopicListener_i *rti_impl_list = 0;
         if (!CORBA::is_nil (a_listener))
           {
@@ -55,6 +64,9 @@ namespace CIAO
                               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
@@ -62,6 +74,7 @@ namespace CIAO
       {
         DDS4CCM_TRACE ("RTI_Topic_i::get_listener");
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDSTopicListener *rti_topic_list = this->impl ()->get_listener ();
         RTI_TopicListener_i *list_proxy = dynamic_cast <RTI_TopicListener_i *> (rti_topic_list);
         if (!list_proxy)
@@ -71,14 +84,21 @@ namespace CIAO
             return ::DDS::TopicListener::_nil ();
           }
         return list_proxy->get_topiclistener ();
+#else
+        return this->impl ()->get_listener ();
+#endif        
       }
 
       ::DDS::ReturnCode_t
       RTI_Topic_i::get_inconsistent_topic_status (::DDS::InconsistentTopicStatus & a_status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         DDS_InconsistentTopicStatus ddsstatus;
         ddsstatus <<= a_status;
         return this->impl ()->get_inconsistent_topic_status (ddsstatus);
+#else
+        return this->impl ()->get_inconsistent_topic_status (a_status);
+#endif        
       }
 
       ::DDS::ReturnCode_t
@@ -90,6 +110,7 @@ namespace CIAO
       ::DDS::StatusCondition_ptr
       RTI_Topic_i::get_statuscondition (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_StatusCondition_i (),
@@ -99,6 +120,9 @@ namespace CIAO
         RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
         rti_sc->set_impl (sc);
         return retval._retn ();
+#else
+        return this->impl ()->get_statuscondition ();
+#endif        
       }
 
       ::DDS::StatusMask
@@ -110,27 +134,40 @@ namespace CIAO
       ::DDS::InstanceHandle_t
       RTI_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 *
       RTI_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 *
       RTI_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
       RTI_Topic_i::get_participant (void)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
         ACE_NEW_THROW_EX (retval,
                           RTI_DomainParticipant_i (),
@@ -140,6 +177,9 @@ namespace CIAO
         RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
         rti_dp->set_impl (p);
         return retval._retn ();
+#else
+        return this->impl ()->get_participant ();
+#endif        
       }
 
       DDSTopic *
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
index 8d71f724e71..5c1059199cb 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_TOPICDATAQOSPOLICY_H
 #define CIAO_RTI_TOPICDATAQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::TopicDataQosPolicy DDS_TopicDataQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::TopicDataQosPolicy &ddsqos, const ::DDS_TopicDataQosPolicy & qos)
 {
@@ -41,5 +46,6 @@ operator>>= (const ::DDS::TopicDataQosPolicy &qos, ::DDS_TopicDataQosPolicy & dd
   ACE_UNUSED_ARG (qos);
 //  ddsqos.value = qos.value;
 }
+#endif
 
 #endif /* CIAO_RTI_TOPICDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
index e3e79eae503..10f90b24dfb 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
@@ -23,6 +23,10 @@
 
 #include "tao/LocalObject.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::TopicDescription DDSTopicDescription;
+#endif
+
 namespace CIAO
 {
   namespace DDS4CCM
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
index 6ff81719fad..95d6496bb18 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
@@ -28,6 +28,7 @@ namespace CIAO
         ::DDSTopic* the_topic,
         const ::DDS_InconsistentTopicStatus & status)
       {
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
         ::DDS::InconsistentTopicStatus ddsstatus;
         ddsstatus <<= status;
         ::DDS::Topic_var dds_topic = ::DDS::Topic::_nil ();
@@ -35,6 +36,9 @@ namespace CIAO
         RTI_Topic_i *tp = dynamic_cast < RTI_Topic_i *> (dds_topic.in ());
         tp->set_impl (the_topic);
         this->impl_->on_inconsistent_topic (dds_topic.in (), ddsstatus);
+#else   
+        this->impl_->on_inconsistent_topic (the_topic, status);
+#endif     
       }
 
       ::DDS::TopicListener_ptr
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
index 661fd33da86..a5746642b33 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
@@ -23,6 +23,11 @@
 #include "LifespanQosPolicy.h"
 #include "OwnershipQosPolicy.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::TopicQos DDS_TopicQos;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::TopicQos &ddsqos, const ::DDS_TopicQos & qos)
 {
@@ -94,5 +99,6 @@ operator>>= (const ::DDS::TopicQos &qos, ::DDS_TopicQos & ddsqos)
   ddsqos.lifespan <<= qos.lifespan;
   ddsqos.ownership <<= qos.ownership;
 }
+#endif
 
 #endif /* CIAO_RTI_TOPICQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
index a3c25147030..f491e2a9e8f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_TRANSPORTPRIOTITYQOSPOLICY_H
 #define CIAO_RTI_TRANSPORTPRIOTITYQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::TransportPriorityQosPolicy DDS_TransportPriorityQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::TransportPriorityQosPolicy &ddsqos, const ::DDS_TransportPriorityQosPolicy & qos)
 {
@@ -32,5 +37,6 @@ operator>>= (const ::DDS::TransportPriorityQosPolicy &qos, ::DDS_TransportPriori
 {
   ddsqos.value <<= qos.value;
 }
+#endif
 
 #endif /* CIAO_RTI_TRANSPORTPRIOTITYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
index bc34253a6bf..054588f839a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
@@ -9,8 +9,11 @@
 #ifndef CIAO_RTI_USERDATAQOSPOLICY_H
 #define CIAO_RTI_USERDATAQOSPOLICY_H
 
-/// @todo
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::UserDataQosPolicy DDS_UserDataQosPolicy;
+#endif
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::UserDataQosPolicy &ddsqos, const ::DDS_UserDataQosPolicy & qos)
 {
@@ -42,5 +45,6 @@ operator>>= (const ::DDS::UserDataQosPolicy &qos, ::DDS_UserDataQosPolicy & ddsq
   ACE_UNUSED_ARG (qos);
 //  ddsqos.value <<= qos.value;
 }
+#endif
 
 #endif /* CIAO_RTI_USERDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
index 8bf3954347d..b125003e396 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_WRITERDATALIFECYCLEQOSPOLICY_H
 #define CIAO_RTI_WRITERDATALIFECYCLEQOSPOLICY_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::WriterDataLifecycleQosPolicy DDS_WriterDataLifecycleQosPolicy;
+#endif
+
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::WriterDataLifecycleQosPolicy &ddsqos, const ::DDS_WriterDataLifecycleQosPolicy & qos)
 {
@@ -32,5 +37,6 @@ operator>>= (const ::DDS::WriterDataLifecycleQosPolicy &qos, ::DDS_WriterDataLif
 {
   ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances;
 }
+#endif
 
 #endif /* CIAO_RTI_WRITERDATALIFECYCLEQOSPOLICY_H */
author	Johnny Willemsen <jwillemsen@remedy.nl>	2010-02-24 07:29:51 +0000
committer	Johnny Willemsen <jwillemsen@remedy.nl>	2010-02-24 07:29:51 +0000
commit	4cadf4af778183f21ede7115bb8969f684a2b35b (patch)
tree	b306ca6d075909a22cf12f8987f615d57b088adf
parent	2245e154246e9cbff7000fdc10e1265a1dc5c053 (diff)
download	ATCD-4cadf4af778183f21ede7115bb8969f684a2b35b.tar.gz