diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h')
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h index f948216ebe7..25244282b6b 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h @@ -6,19 +6,14 @@ * Wrapper facade for NDDS. */ -#ifndef DDS4CCM_PUBLISHERQOS_H -#define DDS4CCM_PUBLISHERQOS_H +#ifndef CIAO_RTI_PUBLISHERQOS_H +#define CIAO_RTI_PUBLISHERQOS_H #include "PresentationQosPolicy.h" #include "PartitionQosPolicy.h" #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) { @@ -54,6 +49,5 @@ operator>>= (const ::DDS::PublisherQos &qos, ::DDS_PublisherQos & ddsqos) ddsqos.group_data <<= qos.group_data; ddsqos.entity_factory <<= qos.entity_factory; } -#endif -#endif /* DDS4CCM_PUBLISHERQOS_H */ +#endif /* CIAO_RTI_PUBLISHERQOS_H */ |