summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CIAO/ChangeLog16
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp5
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Get_T.h3
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp4
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h3
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp4
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h3
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp4
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h3
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp5
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Update_T.h3
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp4
-rw-r--r--CIAO/connectors/dds4ccm/impl/DDS_Write_T.h3
13 files changed, 34 insertions, 26 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 25988b1082f..74aaecdcb7e 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,19 @@
+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
+
Fri Nov 12 12:22:40 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/DDSCallbackStatusHandler.h:
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
index c019b59066b..0d78295b644 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp
@@ -15,8 +15,7 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::~DDS_Get_T (void)
template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
void
-DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::set_component (
- typename CCM_TYPE::base_type::_ptr_type component)
+DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::set_component (::CORBA::Object_ptr component)
{
DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED>::set_component (component);
this->dds_get_->_set_component (component);
@@ -46,7 +45,7 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::remove (
{
DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::remove");
DDSSubscriberBase_type::remove (subscriber);
- this->dds_get_->_set_component (CCM_TYPE::base_type::_nil ());
+ this->dds_get_->_set_component (::CORBA::Object::_nil ());
}
template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h
index 6f9bfc876e3..54592e64b40 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h
@@ -27,8 +27,7 @@ public:
typename CCM_TYPE::getter_type::_ptr_type get_fresh_data (void);
//@}
- void set_component (
- typename CCM_TYPE::base_type::_ptr_type component);
+ void set_component (::CORBA::Object_ptr component);
void configuration_complete (
::DDS::Topic_ptr topic,
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
index 093d12933cd..b50d9a464a8 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
@@ -18,7 +18,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED>::~DDS_Listen_T (void)
template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
void
DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED>::set_component (
- typename CCM_TYPE::base_type::_ptr_type component)
+ ::CORBA::Object_ptr component)
{
DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED>::set_component (component);
this->data_control_->_set_component (component);
@@ -71,7 +71,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED>::remove (
{
DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED>::remove");
- this->data_control_->_set_component (CCM_TYPE::base_type::_nil ());
+ this->data_control_->_set_component (::CORBA::Object::_nil ());
DDSSubscriberBase_type::remove (subscriber);
}
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h
index c4d35309bff..4c1645915a0 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.h
@@ -30,8 +30,7 @@ public:
::CCM_DDS::CCM_DataListenerControl_ptr get_data_control (void);
//@}
- void set_component (
- typename CCM_TYPE::base_type::_ptr_type component);
+ void set_component (::CORBA::Object_ptr component);
void activate (
typename CCM_TYPE::listener_type::_ptr_type listener,
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
index f740a9fa2e5..ae86ca37c8d 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
@@ -21,7 +21,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED>::~DDS_StateListen_T (void)
template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
void
DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED>::set_component (
- typename CCM_TYPE::base_type::_ptr_type component)
+ ::CORBA::Object_ptr component)
{
DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED>::set_component (component);
this->data_control_->_set_component (component);
@@ -74,7 +74,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED>::remove (
{
DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED>::remove");
- this->data_control_->_set_component (CCM_TYPE::base_type::_nil ());
+ this->data_control_->_set_component (::CORBA::Object::_nil ());
DDSSubscriberBase_type::remove (subscriber);
}
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
index 86fbebb4ed7..d4bf20ad559 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
@@ -28,8 +28,7 @@ public:
::CCM_DDS::CCM_StateListenerControl_ptr get_data_control (void);
//@}
- void set_component (
- typename CCM_TYPE::base_type::_ptr_type component);
+ void set_component (::CORBA::Object_ptr component);
void activate (
typename CCM_TYPE::statelistener_type::_ptr_type listener,
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>
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h
index 9b4b73bc103..eb4c4064d7c 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h
@@ -41,8 +41,7 @@ public:
void filter (const ::CCM_DDS::QueryFilter & filter);
//@}
- void set_component (
- typename CCM_TYPE::base_type::_ptr_type component);
+ void set_component (::CORBA::Object_ptr component);
void configuration_complete (
::DDS::Topic_ptr topic,
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
index 07ea8f08e05..f38b9fffa59 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
@@ -23,8 +23,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::~DDS_Update_T (void)
template <typename DDS_TYPE, typename CCM_TYPE>
void
-DDS_Update_T<DDS_TYPE, CCM_TYPE>::set_component (
- typename CCM_TYPE::base_type::_ptr_type component)
+DDS_Update_T<DDS_TYPE, CCM_TYPE>::set_component (::CORBA::Object_ptr component)
{
this->dds_update_->_set_component (component);
}
@@ -157,7 +156,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::remove (
throw ::CORBA::INTERNAL ();
}
this->ccm_dds_writer_->set_rti_entity (0);
- this->dds_update_->_set_component (CCM_TYPE::base_type::_nil ());
+ this->dds_update_->_set_component (::CORBA::Object::_nil ());
this->dds_update_->set_dds_writer (::DDS::DataWriter::_nil ());
}
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h
index 0e98bdaec37..4fd0d35c509 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h
@@ -22,8 +22,7 @@ public:
typename CCM_TYPE::datawriter_type::_ptr_type get_dds_entity (void);
- void set_component (
- typename CCM_TYPE::base_type::_ptr_type component);
+ void set_component (::CORBA::Object_ptr component);
void configuration_complete (
::DDS::Topic_ptr topic,
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
index 0152a3d031a..004c6d024b2 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp
@@ -21,7 +21,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::~DDS_Write_T (void)
template <typename DDS_TYPE, typename CCM_TYPE>
void
DDS_Write_T<DDS_TYPE, CCM_TYPE>::set_component (
- typename CCM_TYPE::base_type::_ptr_type component)
+ ::CORBA::Object_ptr component)
{
this->writer_t_->_set_component (component);
}
@@ -146,7 +146,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::remove (
if (retcode == ::DDS::RETCODE_OK)
{
this->ccm_dds_writer_->set_rti_entity (0);
- this->writer_t_->_set_component (CCM_TYPE::base_type::_nil ());
+ this->writer_t_->_set_component (::CORBA::Object::_nil ());
this->writer_t_->set_dds_writer (::DDS::DataWriter::_nil ());
}
else
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h
index c829e12ce81..c4dbf0a1ade 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h
@@ -30,8 +30,7 @@ public:
typename CCM_TYPE::datawriter_type::_ptr_type get_dds_entity (void);
//@}
- void set_component (
- typename CCM_TYPE::base_type::_ptr_type component);
+ void set_component (::CORBA::Object_ptr component);
void configuration_complete (
::DDS::Topic_ptr topic,
View Lorry Controller Status