Tue Feb 23 13:25:49 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
          Added various pragma's

        * connectors/dds4ccm/idl/dds4ccm.mpc
        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl
        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp
        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h
        * connectors/dds4ccm/impl/ndds/Getter_T.h
        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
        * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
        * connectors/dds4ccm/impl/ndds/Publisher.h
        * connectors/dds4ccm/impl/ndds/PublisherListener.h
        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
        * connectors/dds4ccm/impl/ndds/PublisherListener_T.h
        * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
        * connectors/dds4ccm/impl/ndds/Reader_T.cpp
        * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
        * connectors/dds4ccm/impl/ndds/StringSeq.h
        * connectors/dds4ccm/impl/ndds/Subscriber.h
        * MPC/config/ciaoidldefaults.mpb
        * MPC/config/componentidldefaults.mpb
          Portability changes

23 files changed, 270 insertions, 23 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 79a777b55ae..c696afa9cf4 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,31 @@
+Tue Feb 23 13:25:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
+        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
+        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
+          Added various pragma's
+
+        * connectors/dds4ccm/idl/dds4ccm.mpc
+        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
+        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp
+        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h
+        * connectors/dds4ccm/impl/ndds/Getter_T.h
+        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
+        * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
+        * connectors/dds4ccm/impl/ndds/Publisher.h
+        * connectors/dds4ccm/impl/ndds/PublisherListener.h
+        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
+        * connectors/dds4ccm/impl/ndds/PublisherListener_T.h
+        * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
+        * connectors/dds4ccm/impl/ndds/Reader_T.cpp
+        * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
+        * connectors/dds4ccm/impl/ndds/StringSeq.h
+        * connectors/dds4ccm/impl/ndds/Subscriber.h
+        * MPC/config/ciaoidldefaults.mpb
+        * MPC/config/componentidldefaults.mpb
+          Portability changes
+
 Tue Feb 23 14:08:20 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
diff --git a/CIAO/MPC/config/ciaoidldefaults.mpb b/CIAO/MPC/config/ciaoidldefaults.mpb
index dad74d13aa1..fca16f5509b 100644
--- a/CIAO/MPC/config/ciaoidldefaults.mpb
+++ b/CIAO/MPC/config/ciaoidldefaults.mpb
@@ -2,5 +2,19 @@
 // $Id$
 
 project : taoidldefaults {
-  idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ccm 
+  idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ccm
+
+  Modify_Custom (IDL) {
+    optional(source_pre_extension) {
+      commandflags(-Gsv) += _svnt
+    }
+
+    optional(header_pre_extension) {
+      commandflags(-Gsv) += _svnt
+    }
+
+    optional(generic_outputext) {
+      commandflags(-Glem) += E.idl
+    }
+  }
 }
diff --git a/CIAO/MPC/config/componentidldefaults.mpb b/CIAO/MPC/config/componentidldefaults.mpb
index 666e7784b7a..94601172797 100644
--- a/CIAO/MPC/config/componentidldefaults.mpb
+++ b/CIAO/MPC/config/componentidldefaults.mpb
@@ -3,19 +3,5 @@
 
 project : ciaoidldefaults, anytypecode {
   idlflags += -Gsv -Glem -Gxhst -Gxhsk -Gxhsv -Gxhex
-
-  Modify_Custom (IDL) {
-    optional(source_pre_extension) {
-      commandflags(-Gsv) += _svnt
-    }
-
-    optional(header_pre_extension) {
-      commandflags(-Gsv) += _svnt
-    }
-
-    optional(generic_outputext) {
-      commandflags(-Glem) += E.idl
-    }
-  }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
index 65071745d9b..7dca5c65278 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
@@ -10,6 +10,7 @@
 
 #pragma ndds typesupport "Base/Hello_BaseSupport.h"
 #pragma opendds typesupport "Base/Hello_BaseTypeSupportC.h"
+#pragma splice typesupport "Base/Hello_BaseDcpsC.h"
 
 #pragma DCPS_DATA_TYPE "DDSHello"
 
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
index 908cb977ab4..f3d1d89c76a 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
@@ -9,6 +9,10 @@
 #define QUOTER_BASE_IDL
 
 #pragma ndds typesupport "Base/Quoter_BaseSupport.h"
+#pragma opendds typesupport "Base/Quoter_BaseTypeSupportC.h"
+
+#pragma DCPS_DATA_TYPE "Quoter::Stock_Info"
+#pragma DCPS_DATA_KEY "Quoter::Stock_Info symbol"
 
 module Quoter
 {
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
index 55f3af89daf..fff47bea45f 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
@@ -9,6 +9,10 @@
 #define SHAPES_BASE_IDL
 
 #pragma ndds typesupport "Base/Shapes_BaseSupport.h"
+#pragma opendds typesupport "Base/Shapes_BaseTypeSupportC.h"
+
+#pragma DCPS_DATA_TYPE "ShapeType"
+#pragma DCPS_DATA_KEY "ShapeType color"
 
 struct ShapeType {
   string color; //@key
@@ -17,6 +21,10 @@ struct ShapeType {
   long shapesize;
 };
 
+#pragma DCPS_DATA_TYPE "Attributes"
+#pragma DCPS_DATA_KEY "Attributes shape"
+#pragma DCPS_DATA_KEY "Attributes color"
+
 struct Attributes {
   string shape; //@key
   string color; //@key
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc
index 1d2caee3577..d096ad43a24 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (DDS4CCM_idl_gen) : dds4ccm, ciaoidldefaults, dds4ccm {
+project (DDS4CCM_idl_gen) : dds4ccm, componentidldefaults {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=DDS4CCM_STUB_Export \
               -Wb,stub_export_include=dds4ccm_stub_export.h \
@@ -14,6 +14,7 @@ project (DDS4CCM_idl_gen) : dds4ccm, ciaoidldefaults, dds4ccm {
   }
 
   IDL_Files {
+    idlflags -= -Gxhst -Gxhsk
     dds_rtf2_dcps.idl
     dds_rtf2_dcps_i_handle.idl
     dds4ccm_PortStatusListener.idl
@@ -24,7 +25,7 @@ project (DDS4CCM_idl_gen) : dds4ccm, ciaoidldefaults, dds4ccm {
   }
 }
 
-project (DDS4CCM_lem_gen) : dds4ccm, ciaoidldefaults, dds4ccm {
+project (DDS4CCM_lem_gen) : dds4ccm, ciaoidldefaults {
   custom_only = 1
   after += DDS4CCM_idl_gen
   idlflags += -I$(CIAO_ROOT)/connectors \
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
index 3a98aaae951..e8aaf881028 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
@@ -7,6 +7,163 @@
 
 #if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 # include "dds/DdsDcps.idl"
+module DDS
+{
+  local interface CCM_Listener : ::DDS::Listener
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_TopicListener : ::DDS::TopicListener
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_DataWriterListener : ::DDS::DataWriterListener
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_PublisherListener : ::DDS::PublisherListener
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_DataReaderListener : ::DDS::DataReaderListener
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_SubscriberListener : ::DDS::SubscriberListener
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_DomainParticipantListener : ::DDS::DomainParticipantListener
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_Condition : ::DDS::Condition
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_StatusCondition : ::DDS::StatusCondition
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_ReadCondition : ::DDS::ReadCondition
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_QueryCondition : ::DDS::QueryCondition
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_Entity : ::DDS::Entity
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_DomainParticipant : ::DDS::DomainParticipant
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_DomainParticipantFactory : ::DDS::DomainParticipantFactory
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_TypeSupport : ::DDS::TypeSupport
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_TopicDescription : ::DDS::TopicDescription
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_Topic : ::DDS::Topic
+  {
+  };
+};
+
+
+module DDS
+{
+  local interface ContentFilteredTopic {};
+};
+
+module DDS
+{
+  local interface MultiTopic {};
+};
+
+module DDS
+{
+  local interface CCM_Publisher : ::DDS::Publisher
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_DataWriter : ::DDS::DataWriter
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_Subscriber : ::DDS::Subscriber
+  {
+  };
+};
+
+module DDS
+{
+  local interface CCM_DataReader : ::DDS::DataReader
+  {
+  };
+};
 #endif
 
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
index 9a7ebee2ceb..5211f501100 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
@@ -11,9 +11,14 @@
 
 #include "DomainParticipant.h"
 
+#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 #include "tao/LocalObject.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::ContentFilteredTopic DDSContentFilteredTopic;
+#endif
+
 namespace CIAO
 {
   namespace DDS4CCM
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp
index 429a760791a..136904aa34a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp
@@ -122,6 +122,7 @@ CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_data_on_reade
 {
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
 CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_reliable_reader_activity_changed (
@@ -129,6 +130,7 @@ CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_reliable_read
   const ::DDS::ReliableReaderActivityChangedStatus & )
 {
 }
+#endif
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h
index faf720061c0..2b6aa8bb364 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h
@@ -93,10 +93,12 @@ namespace CIAO
       on_data_on_readers (
         ::DDS::Subscriber_ptr );
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       virtual void
       on_reliable_reader_activity_changed (
         ::DDS::DataWriter_ptr ,
         const ::DDS::ReliableReaderActivityChangedStatus & );
+#endif        
 
     private:
       ::CCM_DDS::ConnectorStatusListener_var error_listener_;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
index 416c356f172..5312d708063 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
@@ -12,7 +12,7 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
 
-#if defined (DDS_MAJOR_VERSION)
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::GuardCondition DDSGuardCondition;
 typedef ::DDS::WaitSet DDSWaitSet;
 typedef ::DDS::ReadCondition DDSReadCondition;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
index e3916285d14..e027dd243ec 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
@@ -12,6 +12,10 @@
 
 #include "InstanceHandle_t.h"
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::InstanceHandleSeq DDS_InstanceHandleSeq;
+#endif
+
 template <typename corbaseq, typename ddsseq>
 void convert_dds_to_corba_sequence(corbaseq & target, const ddsseq& source) {
   target.length (source.length ());
@@ -27,6 +31,7 @@ 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)
 {
@@ -36,6 +41,7 @@ operator<<= (::DDS_InstanceHandleSeq &ddsinstancehandleseqseq, const ::DDS::Inst
       ddsinstancehandleseqseq[index] <<= instancehandleseq[index];
     }
 }
+#endif
 
 inline void
 operator>>= (const ::DDS_InstanceHandleSeq &instancehandle, ::DDS::InstanceHandleSeq & ddsinstancehandleseqseq)
@@ -47,6 +53,7 @@ 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)
 {
@@ -56,5 +63,6 @@ operator>>= (const ::DDS::InstanceHandleSeq &instancehandle, ::DDS_InstanceHandl
       ddsinstancehandleseqseq[index] <<= instancehandle[index];
     }
 }
+#endif
 
 #endif /* CIAO_RTI_INSTANCEHANDLESEQ_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
index 9d507bbe632..68ce3c0d484 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
@@ -93,6 +93,7 @@ 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)
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
index 81818d26be7..da2a338e9b6 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
@@ -21,6 +21,10 @@
 # include "ndds/ndds_cpp.h"
 #endif
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::Publisher DDSPublisher;
+#endif
+
 #include "tao/LocalObject.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
index 16afa936331..0998c1c0dc9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
@@ -21,6 +21,11 @@
 # include "ndds/ndds_cpp.h"
 #endif
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::PublisherListener DDSPublisherListener;
+typedef ::DDS::DataWriter DDSDataWriter;
+#endif
+
 #include "tao/LocalObject.h"
 
 namespace CIAO
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
index 5c57b4afdbd..15cce2fcd52 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
@@ -212,6 +212,7 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_publication_matched (
   this->on_unexpected_status (the_Writer, ::DDS::PUBLICATION_MATCHED_STATUS);
 }
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
 CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_reliable_reader_activity_changed (
@@ -232,7 +233,7 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_reliable_reader_activ
 
   this->on_unexpected_status (the_Writer, ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS);
 }
-
+#endif
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
@@ -243,9 +244,11 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
     {
       return ::DDS::OFFERED_DEADLINE_MISSED_STATUS |
              ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS |
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+             ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS |
+#endif
              ::DDS::LIVELINESS_LOST_STATUS |
-             ::DDS::PUBLICATION_MATCHED_STATUS |
-             ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS;
+             ::DDS::PUBLICATION_MATCHED_STATUS;
     }
   else
     {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h
index 34d7f895686..23c2fe3b747 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h
@@ -46,9 +46,11 @@ namespace CIAO
         ::DDS::DataWriter_ptr the_Writer,
         const ::DDS::PublicationMatchedStatus & status);
 
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       virtual void on_reliable_reader_activity_changed (
         ::DDS::DataWriter_ptr the_Writer,
         const ::DDS::ReliableReaderActivityChangedStatus & status);
+#endif
 
       /// Destructor
       virtual ~PublisherListener_T (void);
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
index 37788b70bf3..098aaf91242 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
@@ -10,6 +10,10 @@
 #ifndef CIAO_RTI_QOSPOLICYCOUNTSEQ_H
 #define CIAO_RTI_QOSPOLICYCOUNTSEQ_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::QosPolicyCountSeq DDS_QosPolicyCountSeq;
+#endif
+
 inline void
 operator<<= (::DDS::QosPolicyCountSeq &/*ddsstatus*/, const ::DDS_QosPolicyCountSeq & /*status*/)
 {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp
index aa7f63432cc..809c5f30bcd 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp
@@ -285,8 +285,8 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_all (
   // Count the number of valid samples
   CORBA::ULong const nr_of_valid_samples = this->get_nr_valid_samples (sample_info);
   DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_all - ")
-                          ACE_TEXT ("total number of samples <%u> - ")
-                          ACE_TEXT ("valid number of samples <%u>\n"),
+                            ACE_TEXT ("total number of samples <%u> - ")
+                            ACE_TEXT ("valid number of samples <%u>\n"),
                             data.length (),
                             nr_of_valid_samples));
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
index 9d9f203c649..66b7a0c63da 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
@@ -20,6 +20,7 @@ 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)
 {
@@ -27,6 +28,7 @@ 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)
@@ -36,6 +38,7 @@ 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)
 {
@@ -43,5 +46,6 @@ operator>>= (const ::DDS::RequestedDeadlineMissedStatus &status, ::DDS_Requested
   ddsstatus.total_count_change = status.total_count_change;
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
+#endif
 
 #endif /* CIAO_RTI_REQUESTEDDEADLINEMISSEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
index 23b5d723ca0..3017181bae3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
@@ -9,6 +9,11 @@
 #ifndef CIAO_RTI_STRINGSEQ_T_H
 #define CIAO_RTI_STRINGSEQ_T_H
 
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
+typedef ::DDS::StringSeq DDS_StringSeq;
+typedef long DDS_Long;
+#endif
+
 inline void
 operator<<= (::DDS::StringSeq & string_seq, const ::DDS_StringSeq & dds_string_seq)
 {
@@ -19,6 +24,7 @@ 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)
 {
@@ -32,5 +38,6 @@ operator<<= (::DDS_StringSeq & dds_string_seq, const ::DDS::StringSeq & string_s
     dds_string_seq.from_array (parameterlist, string_seq.length ());
     delete [] parameterlist;
 }
+#endif
 
 #endif /* CIAO_RTI_STRINGSEQ_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
index 3fd624a8b70..d40d7e99910 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
@@ -27,6 +27,7 @@
 typedef ::DDS::Subscriber DDSSubscriber;
 typedef ::DDS::DataReaderListener DDSDataReaderListener;
 typedef ::DDS::ContentFilteredTopic DDSContentFilteredTopic;
+typedef ::DDS::Topic DDSTopic;
 #endif
 
 namespace CIAO