diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-12 12:41:12 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-12 12:41:12 +0000 |
| commit | 1fd05b6bbf80c12c926bd3f04195e17058632ec4 (patch) | |
| tree | dcf3a2e4d5cea8966341224bfcc7fc96312275bf /CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp | |
| parent | 34ac337b673f7955b35f40f50cdc1ab155f1c5a1 (diff) | |
| download | ATCD-1fd05b6bbf80c12c926bd3f04195e17058632ec4.tar.gz | |
Fri Nov 12 12:37:02 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/DDS_Get_T.h:
* connectors/dds4ccm/impl/DDS_Get_T.cpp:
* connectors/dds4ccm/impl/DDS_Listen_T.h:
* connectors/dds4ccm/impl/DDS_Listen_T.cpp:
* connectors/dds4ccm/impl/DDS_StateListen_T.h:
* connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
* connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h:
* connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
* connectors/dds4ccm/impl/DDS_Update_T.h:
* connectors/dds4ccm/impl/DDS_Update_T.cpp:
* connectors/dds4ccm/impl/DDS_Write_T.h:
* connectors/dds4ccm/impl/DDS_Write_T.cpp:
Simplified set_component
Diffstat (limited to 'CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp')
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp index e17c61cbca5..b8bde4cdb08 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp @@ -17,7 +17,7 @@ DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED>::~DDS_Subscriber_Base_T (void) template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED> void DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED>::set_component ( - typename CCM_TYPE::base_type::_ptr_type component) + ::CORBA::Object_ptr component) { this->dds_read_->_set_component (component); } @@ -148,7 +148,7 @@ DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED>::remove ( //TODO: reimplement this // this->data_reader_->delete_datareader (subscriber); this->cft_setting_->delete_contentfilteredtopic (subscriber); - this->dds_read_->_set_component (CCM_TYPE::base_type::_nil ()); + this->dds_read_->_set_component (::CORBA::Object::_nil ()); } template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED> |