1 files changed, 37 insertions, 43 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h
index 1e12f982023..20b40839cd9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h
@@ -15,7 +15,7 @@
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 #include "tao/LocalObject.h"
 
-#if defined (DDS_MAJOR_VERSION)
+#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
 typedef ::DDS::Topic DDSTopic;
 #endif
 
@@ -23,66 +23,60 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    namespace RTI
+    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Topic_i :
+      public virtual ::DDS::CCM_Topic,
+      public virtual ::CORBA::LocalObject
     {
-      class DDS4CCM_NDDS_IMPL_Export RTI_Topic_i :
-        public virtual ::DDS::CCM_Topic,
-        public virtual ::CORBA::LocalObject
-      {
-      public:
-        // Constructor
-        RTI_Topic_i (void);
+    public:
+      /// Constructor
+      CCM_DDS_Topic_i (DDSTopic* topic);
 
-        // Destructor
-        virtual ~RTI_Topic_i (void);
+      /// Destructor
+      virtual ~CCM_DDS_Topic_i (void);
 
-        virtual
-          ::DDS::ReturnCode_t set_qos (const ::DDS::TopicQos & qos);
+      virtual ::DDS::ReturnCode_t set_qos (const ::DDS::TopicQos & qos);
 
-        virtual
-          ::DDS::ReturnCode_t get_qos (::DDS::TopicQos & qos);
+      virtual ::DDS::ReturnCode_t get_qos (::DDS::TopicQos & qos);
 
-        virtual
-          ::DDS::ReturnCode_t set_listener (::DDS::TopicListener_ptr a_listener,
-                                            ::DDS::StatusMask mask);
+      virtual ::DDS::ReturnCode_t set_listener (
+        ::DDS::TopicListener_ptr a_listener,
+        ::DDS::StatusMask mask);
 
-        virtual
-          ::DDS::TopicListener_ptr get_listener (void);
+      virtual ::DDS::TopicListener_ptr get_listener (void);
 
-        virtual
-          ::DDS::ReturnCode_t get_inconsistent_topic_status (::DDS::InconsistentTopicStatus & a_status);
+      virtual ::DDS::ReturnCode_t get_inconsistent_topic_status (
+        ::DDS::InconsistentTopicStatus & a_status);
 
-        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::InstanceHandle_t get_instance_handle (void);
+      virtual
+        ::DDS::InstanceHandle_t get_instance_handle (void);
 
-        virtual
-          char * get_type_name (void);
+      virtual
+        char * get_type_name (void);
 
-        virtual
-          char * get_name (void);
+      virtual
+        char * get_name (void);
 
-        virtual
-          ::DDS::DomainParticipant_ptr get_participant (void);
+      virtual
+        ::DDS::DomainParticipant_ptr get_participant (void);
 
-        DDSTopic * get_impl (void);
+      DDSTopic * get_impl (void);
 
-        void set_impl (DDSTopic * topic);
+      void set_impl (DDSTopic* topic);
 
-      private:
-        DDSTopic * impl_;
+    private:
+      DDSTopic * impl_;
 
-        DDSTopic * impl (void);
-      };
-    }
+      DDSTopic * impl (void);
+    };
   }
 }