1 files changed, 3 insertions, 9 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
index 31dbeb1b32d..00b58fe57c7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DESTINATIONORDERQOSPOLICY_H
-#define DDS4CCM_DESTINATIONORDERQOSPOLICY_H
+#ifndef CIAO_RTI_DESTINATIONORDERQOSPOLICY_H
+#define CIAO_RTI_DESTINATIONORDERQOSPOLICY_H
 
 #include "Duration_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DestinationOrderQosPolicy DDS_DestinationOrderQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DestinationOrderQosPolicy &ddsqos, const ::DDS_DestinationOrderQosPolicy & qos)
 {
@@ -39,6 +34,5 @@ operator>>= (const ::DDS::DestinationOrderQosPolicy &qos, ::DDS_DestinationOrder
 {
   ddsqos.kind = static_cast < ::DDS_DestinationOrderQosPolicyKind> (qos.kind);
 }
-#endif
 
-#endif /* DDS4CCM_DESTINATIONORDERQOSPOLICY_H */
+#endif /* CIAO_RTI_DESTINATIONORDERQOSPOLICY_H */