1 files changed, 8 insertions, 21 deletions

diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
index 8d3d816576d..16f664924c8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
@@ -13,19 +13,14 @@
 #include "Time_t.h"
 #include "InstanceHandle_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::SampleStateKind DDS_SampleStateKind;
-typedef ::DDS::SampleInfo DDS_SampleInfo;
-#endif
-
 inline void
 operator<<= (::CCM_DDS::AccessStatus & access_status, const ::DDS_SampleStateKind & sample_state)
 {
-  if (sample_state == ::DDS::NOT_READ_SAMPLE_STATE)
+  if (sample_state == DDS_NOT_READ_SAMPLE_STATE)
     {
       access_status = ::CCM_DDS::FRESH_INFO;
     }
-  else if (sample_state == ::DDS::READ_SAMPLE_STATE)
+  else if (sample_state == DDS_READ_SAMPLE_STATE)
     {
       access_status = ::CCM_DDS::ALREADY_SEEN;
     }
@@ -34,32 +29,24 @@ 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 &&
-      sample_info.view_state == ::DDS::NEW_VIEW_STATE)
+  if (sample_info.instance_state == DDS_ALIVE_INSTANCE_STATE && 
+      sample_info.view_state == DDS_NEW_VIEW_STATE)
     {
       // Instance_status new
       ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_CREATED;
     }
-  else if (sample_info.instance_state == ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
+  else if (sample_info.instance_state == DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE)
     {
       // Instance_status deleted
       ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_DELETED;
     }
-  else if ((sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE &&
-            sample_info.view_state == ::DDS::NOT_NEW_VIEW_STATE) ||
-            sample_info.instance_state == ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE)
+  else if ((sample_info.instance_state == DDS_ALIVE_INSTANCE_STATE &&
+            sample_info.view_state == DDS_NOT_NEW_VIEW_STATE) ||
+            sample_info.instance_state == DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE)
     {
       // Instance_status updated
       ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_UPDATED;