diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h')
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h | 12 |
1 files changed, 10 insertions, 2 deletions
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 |