1 files changed, 89 insertions, 88 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
index ace577ce6e3..cb40be6bcd5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
@@ -7,136 +7,137 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DATAREADER_H
-#define DDS4CCM_DATAREADER_H
+#ifndef CIAO_RTI_DATAREADER_H
+#define CIAO_RTI_DATAREADER_H
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
-#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 #include "tao/LocalObject.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DataReader DDSDataReader;
-#endif
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataReader_i
-      : public virtual ::DDS::CCM_DataReader,
-        public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_DataReader_i (void);
+      class DDS4CCM_NDDS_IMPL_Export RTI_DataReader_i
+        : public virtual ::DDS::CCM_DataReader,
+          public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_DataReader_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_DataReader_i (void);
+        // Destructor
+        virtual ~RTI_DataReader_i (void);
 
-      virtual ::DDS::ReturnCode_t
-      enable (void);
+        virtual ::DDS::ReturnCode_t
+        enable (void);
 
-      virtual ::DDS::StatusCondition_ptr
-      get_statuscondition (void);
+        virtual ::DDS::StatusCondition_ptr
+        get_statuscondition (void);
 
-      virtual ::DDS::StatusMask
-      get_status_changes (void);
+        virtual ::DDS::StatusMask
+        get_status_changes (void);
 
-      virtual DDS_INSTANCE_HANDLE_T_RETN
-      get_instance_handle (void);
+        virtual ::DDS::InstanceHandle_t
+        get_instance_handle (void);
 
-      virtual ::DDS::ReadCondition_ptr
-      create_readcondition (
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
+        virtual ::DDS::ReadCondition_ptr
+        create_readcondition (
+          ::DDS::SampleStateMask sample_states,
+          ::DDS::ViewStateMask view_states,
+          ::DDS::InstanceStateMask instance_states);
 
-      virtual ::DDS::QueryCondition_ptr
-      create_querycondition (
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states,
-        const char * query_expression,
-        const ::DDS::StringSeq & query_parameters);
+        virtual ::DDS::QueryCondition_ptr
+        create_querycondition (
+          ::DDS::SampleStateMask sample_states,
+          ::DDS::ViewStateMask view_states,
+          ::DDS::InstanceStateMask instance_states,
+          const char * query_expression,
+          const ::DDS::StringSeq & query_parameters);
 
-      virtual ::DDS::ReturnCode_t
-      delete_readcondition (
-        ::DDS::ReadCondition_ptr a_condition);
+        virtual ::DDS::ReturnCode_t
+        delete_readcondition (
+          ::DDS::ReadCondition_ptr a_condition);
 
-      virtual ::DDS::ReturnCode_t
-      delete_contained_entities (void);
+        virtual ::DDS::ReturnCode_t
+        delete_contained_entities (void);
 
-      virtual ::DDS::ReturnCode_t
-      set_qos (const ::DDS::DataReaderQos & qos);
+        virtual ::DDS::ReturnCode_t
+        set_qos (
+          const ::DDS::DataReaderQos & qos);
 
-      virtual ::DDS::ReturnCode_t
-      get_qos (::DDS::DataReaderQos & qos);
+        virtual ::DDS::ReturnCode_t
+        get_qos (
+          ::DDS::DataReaderQos & qos);
 
-      virtual ::DDS::ReturnCode_t
-      set_listener (
-        ::DDS::DataReaderListener_ptr a_listener,
-        ::DDS::StatusMask mask);
+        virtual ::DDS::ReturnCode_t
+        set_listener (
+          ::DDS::DataReaderListener_ptr a_listener,
+          ::DDS::StatusMask mask);
 
-      virtual ::DDS::DataReaderListener_ptr
-      get_listener (void);
+        virtual ::DDS::DataReaderListener_ptr
+        get_listener (void);
 
-      virtual ::DDS::TopicDescription_ptr
-      get_topicdescription (void);
+        virtual ::DDS::TopicDescription_ptr
+        get_topicdescription (void);
 
-      virtual ::DDS::Subscriber_ptr
-      get_subscriber (void);
+        virtual ::DDS::Subscriber_ptr
+        get_subscriber (void);
 
-      virtual ::DDS::ReturnCode_t
-      get_sample_rejected_status (::DDS::SampleRejectedStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_sample_rejected_status (
+          ::DDS::SampleRejectedStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      get_liveliness_changed_status (
-        ::DDS::LivelinessChangedStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_liveliness_changed_status (
+          ::DDS::LivelinessChangedStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      get_requested_deadline_missed_status (
-        ::DDS::RequestedDeadlineMissedStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_requested_deadline_missed_status (
+          ::DDS::RequestedDeadlineMissedStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      get_requested_incompatible_qos_status (
-        ::DDS::RequestedIncompatibleQosStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_requested_incompatible_qos_status (
+          ::DDS::RequestedIncompatibleQosStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      get_subscription_matched_status (
-        ::DDS::SubscriptionMatchedStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_subscription_matched_status (
+          ::DDS::SubscriptionMatchedStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      get_sample_lost_status (::DDS::SampleLostStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_sample_lost_status (
+          ::DDS::SampleLostStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      wait_for_historical_data (const ::DDS::Duration_t & max_wait);
+        virtual ::DDS::ReturnCode_t
+        wait_for_historical_data (
+          const ::DDS::Duration_t & max_wait);
 
-      virtual ::DDS::ReturnCode_t
-      get_matched_publications (
-        ::DDS::InstanceHandleSeq & publication_handles);
+        virtual ::DDS::ReturnCode_t
+        get_matched_publications (
+          ::DDS::InstanceHandleSeq & publication_handles);
 
-      virtual ::DDS::ReturnCode_t
-      get_matched_publication_data (
-        ::DDS::PublicationBuiltinTopicData & publication_data,
-        DDS_INSTANCE_HANDLE_T_IN publication_handle);
+        virtual ::DDS::ReturnCode_t
+        get_matched_publication_data (
+          ::DDS::PublicationBuiltinTopicData & publication_data,
+          const ::DDS::InstanceHandle_t & publication_handle);
 
-      DDSDataReader * get_impl (void);
+        DDSDataReader * get_impl (void);
 
-      void set_impl (DDSDataReader * dr);
+        void set_impl (DDSDataReader * dr);
 
-    private:
-      DDSDataReader * impl_;
+      private:
+        DDSDataReader * impl_;
 
-      DDSDataReader * impl (void);
-    };
+        DDSDataReader * impl (void);
+      };
+    }
   }
 }