diff options
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 396da9b8fb9..e29fe165918 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Sat Dec 4 10:37:05 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: + Replace DDS4CCM logging macros with ACE macros, since this is user code + and doesn't belong to the DDS4CCM core. This'll probably solve unresolved + externals on windows builds. + Fri Dec 3 14:20:25 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp index 333b49315ca..dd2fe7096a3 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp @@ -12,7 +12,7 @@ template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, b typename CCM_TYPE::supplier_sq_traits::data_type::_ptr_type DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_sq_data (void) { - DDS4CCM_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_sq_data"); + ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_sq_data"); typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = this->sq_supplier_.get_data (); @@ -126,7 +126,7 @@ template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, b typename CCM_TYPE::supplier_tr_traits::data_type::_ptr_type DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_tr_data (void) { - DDS4CCM_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_tr_data"); + ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_tr_data"); typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = this->tr_supplier_.get_data (); @@ -245,7 +245,7 @@ template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, b typename CCM_TYPE::supplier_cl_traits::data_type::_ptr_type DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_cl_data (void) { - DDS4CCM_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_cl_data"); + ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_cl_data"); typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = this->cl_supplier_.get_data (); return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ()); |