diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h')
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h index b2018f2ec82..2be0c9005a1 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h @@ -6,18 +6,12 @@ * Wrapper facade for NDDS. */ -#ifndef DDS4CCM_PRESENTATIONQOSPOLICY_H -#define DDS4CCM_PRESENTATIONQOSPOLICY_H +#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) { - ddsqos.access_scope = static_cast < ::DDS::PresentationQosPolicyAccessScopeKind> (qos.access_scope); ddsqos.coherent_access = qos.coherent_access; ddsqos.ordered_access = qos.ordered_access; } @@ -25,7 +19,6 @@ operator<<= (::DDS::PresentationQosPolicy &ddsqos, const ::DDS_PresentationQosPo inline void operator<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPolicy & qos) { - ddsqos.access_scope = static_cast < DDS_PresentationQosPolicyAccessScopeKind> (qos.access_scope); ddsqos.coherent_access = qos.coherent_access; ddsqos.ordered_access = qos.ordered_access; } @@ -33,7 +26,6 @@ operator<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPo inline void operator>>= (const ::DDS_PresentationQosPolicy &qos, ::DDS::PresentationQosPolicy & ddsqos) { - ddsqos.access_scope = static_cast < ::DDS::PresentationQosPolicyAccessScopeKind> (qos.access_scope); ddsqos.coherent_access = qos.coherent_access; ddsqos.ordered_access = qos.ordered_access; } @@ -41,10 +33,8 @@ operator>>= (const ::DDS_PresentationQosPolicy &qos, ::DDS::PresentationQosPolic inline void operator>>= (const ::DDS::PresentationQosPolicy &qos, ::DDS_PresentationQosPolicy & ddsqos) { - ddsqos.access_scope = static_cast < DDS_PresentationQosPolicyAccessScopeKind> (qos.access_scope); ddsqos.coherent_access = qos.coherent_access; ddsqos.ordered_access = qos.ordered_access; } -#endif -#endif /* DDS4CCM_PRESENTATIONQOSPOLICY_H */ +#endif /* CIAO_RTI_PRESENTATIONQOSPOLICY_H */ |