1 files changed, 5 insertions, 47 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
index 898390a5959..5bd4a39e1b7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
@@ -2,67 +2,25 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 
 #include "dds4ccm/impl/ndds/DataWriter.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::DataWriterListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::DataWriterListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::DataWriterListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::~DataWriterListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::~DataWriterListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::~DataWriterListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_offered_deadline_missed (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::OfferedDeadlineMissedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_offered_incompatible_qos (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::OfferedIncompatibleQosStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_liveliness_lost (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::LivelinessLostStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_publication_matched (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::PublicationMatchedStatus & )
-{
-}
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_reliable_reader_activity_changed (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::ReliableReaderActivityChangedStatus & )
-{
-}
-#endif
-
-template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
 CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::get_mask (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::get_mask");
-  return 0;
+  CIAO_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::get_mask");
+  return DDS_STATUS_MASK_NONE;
 }