1 files changed, 20 insertions, 21 deletions

diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp
index 477d51e4ad2..8dd7421bb30 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp
@@ -8,7 +8,7 @@
 #include "dds4ccm/impl/ndds/DataListenerControl_T.h"
 #include "dds4ccm/impl/ndds/PortStatusListener_T.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::DDS_Read_T (void)
@@ -28,7 +28,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
   const char* library_name,
   const char* profile_name)
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
 
   try
     {
@@ -53,8 +53,8 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
                   ::DDS::DataReaderListener::_nil (),
                   0);
             }
-          ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd =
-            dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ());
+          ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *rd =
+            dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *> (reader.in ());
           this->rti_reader_.set_impl (rd->get_impl ());
           this->data_ = ::DDS::CCM_DataReader::_narrow (reader);
           this->dds_read_.set_impl (reader);
@@ -63,7 +63,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::configuration_complete: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::configuration_complete: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -71,27 +71,24 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::activate (
-  ::CCM_DDS::PortStatusListener_ptr listener,
-  ACE_Reactor* reactor)
+  ::CCM_DDS::PortStatusListener_ptr listener)
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::activate");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::activate");
 
   try
     {
       if (CORBA::is_nil (this->status_.in ()))
         {
-          ACE_NEW_THROW_EX (this->status_,
-                            PortStatusListener (listener, reactor),
-                            CORBA::NO_MEMORY ());
+          this->status_ = new ::CIAO::DDS4CCM::RTI::PortStatusListener_T
+            <DDS_TYPE, CCM_TYPE> (listener);
         }
       this->rti_reader_.set_listener (
         this->status_.in (),
-        ::CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-          listener));
+        ::CIAO::DDS4CCM::RTI::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::activate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::activate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -100,16 +97,18 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::passivate ()
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::passivate");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::passivate");
 
   try
     {
-      this->rti_reader_.set_listener (::DDS::DataReaderListener::_nil (), 0);
+      this->rti_reader_.set_listener (
+              ::DDS::DataReaderListener::_nil (),
+              0);
       this->status_ = ::DDS::DataReaderListener::_nil ();
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::passivate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::passivate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -119,7 +118,7 @@ void
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::remove (
   ::DDS::Subscriber_ptr subscriber)
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::remove");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::remove");
 
   try
     {
@@ -130,7 +129,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::remove (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::remove: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::remove: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -139,7 +138,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_data (void)
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_data");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_data");
 
   return &this->dds_read_;
 }
@@ -148,7 +147,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void)
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
 
   return &this->rti_reader_;
 }