1 files changed, 26 insertions, 27 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
index e00754ba14e..314b59416fa 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_DDS4CCM_TOPICDESCRIPTION_H
-#define CIAO_DDS4CCM_TOPICDESCRIPTION_H
+#ifndef CIAO_RTI_TOPICDESCRIPTION_H
+#define CIAO_RTI_TOPICDESCRIPTION_H
 
 #include "tao/LocalObject.h"
 
@@ -17,47 +17,46 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#endif
-
 #include "tao/LocalObject.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::TopicDescription DDSTopicDescription;
-#endif
-
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_TopicDescription_i :
-      public virtual ::DDS::CCM_TopicDescription,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_TopicDescription_i (DDSTopicDescription * rc);
+      class DDS4CCM_NDDS_IMPL_Export RTI_TopicDescription_i :
+        public virtual ::DDS::CCM_TopicDescription,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_TopicDescription_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_TopicDescription_i (void);
+        // Destructor
+        virtual ~RTI_TopicDescription_i (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);
 
-      DDSTopicDescription * get_impl (void);
+        DDSTopicDescription * get_impl (void);
 
-      void set_impl (DDSTopicDescription * rc);
+        void set_impl (DDSTopicDescription * rc);
 
-    private:
-      DDSTopicDescription * impl_;
+      private:
+        DDSTopicDescription * impl_;
 
-      DDSTopicDescription * impl (void);
-    };
+        DDSTopicDescription * impl (void);
+      };
+    }
   }
 }
 
-#endif /* CIAO_DDS4CCM_TOPICDESCRIPTION_H */
+#endif /* CIAO_RTI_TOPICDESCRIPTION_H */