Fri Aug 27 18:38:37 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp:
        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp:
        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
          Fixed gcc warnings and use new ACE_Thread_Id assignment operator

18 files changed, 50 insertions, 76 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
index 10e634ee70e..a5af72d2747 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
@@ -52,8 +52,7 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl
     const DDS::OfferedDeadlineMissedStatus & status)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
 
     if(status.last_instance_handle.isValid && ! ::CORBA::is_nil (the_writer))
       {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
index caf1780ecc8..c3f2b1ca488 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
@@ -39,8 +39,7 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl
     const DDS::RequestedIncompatibleQosStatus & /*status*/)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
 
     if(! ::CORBA::is_nil(the_reader))
       {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
index c63924a642a..f8669ed98a6 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
@@ -54,8 +54,7 @@ namespace CIAO_CSL_QoSTest_Sender_Impl
     const DDS::OfferedIncompatibleQosStatus & /*status*/)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
 
     if(! ::CORBA::is_nil(the_writer))
       {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
index 14a86cd8149..2e52a85a558 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
@@ -49,8 +49,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
     const DDS::SampleRejectedStatus & status)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
     if (status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT &&
         ! ::CORBA::is_nil(the_reader))
       {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
index 79836f5b2d3..3c973baacc6 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
@@ -32,10 +32,11 @@ namespace CIAO_CSL_USTest_Receiver_Impl
   //============================================================
   // ConnectorStatusListener_exec_i
   //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &subscription_matched_received,
-                                                                  Atomic_Boolean &liveliness_changed_received,
-                                                                 ACE_Thread_ID &thread_id_subcription_matched,
-                                                                 ACE_Thread_ID &thread_id_liveliness_changed)
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
+    Atomic_Boolean &subscription_matched_received,
+    Atomic_Boolean &liveliness_changed_received,
+    ACE_Thread_ID &thread_id_subcription_matched,
+    ACE_Thread_ID &thread_id_liveliness_changed)
    : subscription_matched_received_ (subscription_matched_received),
      liveliness_changed_received_ (liveliness_changed_received),
      thread_id_subcription_matched_ (thread_id_subcription_matched),
@@ -90,14 +91,12 @@ namespace CIAO_CSL_USTest_Receiver_Impl
     if (! ::CORBA::is_nil (the_entity) && status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
       {
         this->subscription_matched_received_ = true;
-        this->thread_id_subcription_matched_.handle (t_id.handle ());
-        this->thread_id_subcription_matched_.id (t_id.id ());
+        this->thread_id_subcription_matched_ = t_id;
       }
     else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_CHANGED_STATUS)
       {
         this->liveliness_changed_received_ = true;
-        this->thread_id_liveliness_changed_.handle (t_id.handle ());
-        this->thread_id_liveliness_changed_.id (t_id.id ());
+        this->thread_id_liveliness_changed_ = t_id;
       }
   }
 
@@ -143,9 +142,9 @@ namespace CIAO_CSL_USTest_Receiver_Impl
   Receiver_exec_i::Receiver_exec_i (void)
     : subscription_matched_received_ (false),
       liveliness_changed_received_ (false),
-      received_(0),
       thread_id_listener_subscription_matched_ (0, 0),
-      thread_id_listener_liveliness_changed_ (0, 0)
+      thread_id_listener_liveliness_changed_ (0, 0),
+      received_(0)
   {
     this->lc_ = ::CCM_DDS::DataListenerControl::_nil ();
     this->pulser_= new Pulser (*this);
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
index fcbfcd7c91d..fbe1f948f7f 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
@@ -99,28 +99,23 @@ namespace CIAO_CSL_USTest_Sender_Impl
     if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_LOST_STATUS)
       {
         this->liveliness_lost_received_ = true;
-        this->thread_id_liveliness_lost_.handle (t_id.handle ());
-        this->thread_id_liveliness_lost_.id (t_id.id ());
+        this->thread_id_liveliness_lost_ = t_id;
     }
     else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS)
       {
         this->publication_matched_received_ = true;
-        this->thread_id_publication_matched_.handle (t_id.handle ());
-        this->thread_id_publication_matched_.id (t_id.id ());
+        this->thread_id_publication_matched_ = t_id;
 
       }
     else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS)
       {
         this->reliable_dr_activity_changed_received_ = true;
-        this->thread_id_reliable_dr_activity_changed_.handle (t_id.handle ());
-        this->thread_id_reliable_dr_activity_changed_.id (t_id.id ());
+        this->thread_id_reliable_dr_activity_changed_ = t_id;
       }
     else if (! ::CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS)
       {
         this->reliable_writer_cache_changed_received_ = true;
-       this->thread_id_reliable_writer_cache_changed_.handle (t_id.handle ());
-        this->thread_id_reliable_writer_cache_changed_.id (t_id.id ());
-
+        this->thread_id_reliable_writer_cache_changed_ = t_id;
       }
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
index 58a89b96cb8..436e0c803ee 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
@@ -35,8 +35,7 @@ namespace CIAO_CFTLE_Test_Receiver_Impl
                                   const ::CCM_DDS::ReadInfo & info)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id
     ++this->samples_received_;
     ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenEventTest_Listener::on_one_data: "
                           "key <%C> - iteration <%d>\n",
@@ -78,11 +77,11 @@ namespace CIAO_CFTLE_Test_Receiver_Impl
   // Receiver_exec_i
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10),
+    : thread_id_listener_ (0, 0),
+      iterations_ (10),
       keys_ (5),
       samples_expected_ (keys_ * SAMPLES_PER_KEY),
-      samples_received_ (0),
-      thread_id_listener_ (0, 0)
+      samples_received_ (0)
   {
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp
index 31d9381e8d7..545caeeed7b 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver_exec.cpp
@@ -56,8 +56,7 @@ namespace CIAO_CFTLS_Test_Receiver_Impl
                       const CCM_DDS::ReadInfo& /*read_info*/)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
     ++this->samples_received_;
 
     ACE_DEBUG ((LM_DEBUG, "ContentFilteredTopicListenStateTest_Listener::on_one_update: "
@@ -91,11 +90,11 @@ namespace CIAO_CFTLS_Test_Receiver_Impl
   // Receiver_exec_i
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10),
+    : thread_id_listener_ (0, 0),
+      iterations_ (10),
       keys_ (5),
       samples_expected_ (keys_ * SAMPLES_PER_KEY),
-      samples_received_ (0),
-      thread_id_listener_ (0, 0)
+      samples_received_ (0)
   {
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
index be3116c6498..8863aed1dfd 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
@@ -32,8 +32,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
                                   const ::CCM_DDS::ReadInfo & info)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
 
     ACE_DEBUG ((LM_DEBUG, "ListenOneByOneTest_Listener_exec_i::on_one_data: "
                             "key <%C> - iteration <%d>\n",
@@ -74,10 +73,9 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   Receiver_exec_i::Receiver_exec_i (void)
     : received_one_by_one_ (0),
       received_many_by_many_ (0),
+      thread_id_listener_ (0, 0),
       iterations_ (10),
-      keys_ (5),
-      thread_id_listener_ (0, 0)
-
+      keys_ (5)
   {
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
index eacfc172b4f..3cd719843a6 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver_exec.cpp
@@ -27,8 +27,7 @@ namespace CIAO_OIT_Test_Receiver_Impl
     const DDS::InconsistentTopicStatus & /* status */)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
     this->inconsistent_ = true;
     this->inconsistent_ = true;
   }
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
index 1144396eece..e306967bdd5 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender_exec.cpp
@@ -30,8 +30,7 @@ namespace CIAO_OIT_Test_Sender_Impl
      const DDS::InconsistentTopicStatus & /*status*/)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
     this->inconsistent_ = true;
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
index d396a3177a7..17ad6b1f79e 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
@@ -102,15 +102,13 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
       {
         this->deadline_port_1_ = true;
         ACE_Thread_ID t_id;
-        this->thread_id_1_.handle (t_id.handle ());
-        this->thread_id_1_.id (t_id.id ());
+        this->thread_id_1_ = t_id;
       }
     if (this->port_nr_ == 2 && ! ::CORBA::is_nil (the_reader) && status.total_count!= 0)
       {
         this->deadline_port_2_ = true;
         ACE_Thread_ID t_id;
-        this->thread_id_2_.handle (t_id.handle ());
-        this->thread_id_2_.id (t_id.id ());
+        this->thread_id_2_ = t_id;
       }
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
index a605c7b26ee..6441a3f6114 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
@@ -107,14 +107,12 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
     if (this->port_nr_ == 1)
       {
         ACE_Thread_ID t_id;
-        this->thread_id_1_.handle (t_id.handle ());
-        this->thread_id_1_.id (t_id.id ());
+        this->thread_id_1_ = t_id;
       }
     if (this->port_nr_ == 2)
       {
         ACE_Thread_ID t_id;
-        this->thread_id_2_.handle (t_id.handle ());
-        this->thread_id_2_.id (t_id.id ());
+        this->thread_id_2_ = t_id;
      }
 
     if (this->port_nr_ == 1 &&
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
index 368d4c4a70b..5963a1edcf0 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
@@ -37,8 +37,7 @@ namespace CIAO_QCLE_Test_Receiver_Impl
     const ::CCM_DDS::ReadInfo & info)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
     ++this->samples_received_;
 
     ACE_DEBUG ((LM_DEBUG, "QueryConditionListenEventTest_Listener::on_one_data: "
@@ -81,11 +80,11 @@ namespace CIAO_QCLE_Test_Receiver_Impl
   // Receiver_exec_i
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10),
+    : thread_id_listener_ (0, 0),
+      iterations_ (10),
       keys_ (5),
       samples_expected_ (keys_ * SAMPLES_PER_KEY),
-      samples_received_ (0),
-      thread_id_listener_ (0, 0)
+      samples_received_ (0)
   {
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
index d12cff5fd1d..4bde8f5de24 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.cpp
@@ -56,8 +56,7 @@ namespace CIAO_QCLS_Test_Receiver_Impl
                       const CCM_DDS::ReadInfo& /*read_info*/)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
     ++this->samples_received_;
 
     ACE_DEBUG ((LM_DEBUG, "QueryConditionListenStateTest_Listener::on_one_update: "
@@ -90,11 +89,11 @@ namespace CIAO_QCLS_Test_Receiver_Impl
   // Receiver_exec_i
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10),
+    : thread_id_listener_ (0, 0),
+      iterations_ (10),
       keys_ (5),
       samples_expected_ (keys_ * SAMPLES_PER_KEY),
-      samples_received_ (0),
-      thread_id_listener_ (0, 0)
+      samples_received_ (0)
   {
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
index 2ff097afb0c..ad114f03365 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
@@ -38,8 +38,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl
     const ::CCM_DDS::ReadInfo & info)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_1_.handle (t_id.handle ());
-    this->thread_id_1_.id (t_id.id ());
+    this->thread_id_1_ = t_id;
     ++this->samples_received_1_;
 
     ACE_DEBUG ((LM_DEBUG, "QueryConditionTwoListenersTest_Listener_1::on_one_data: "
@@ -99,8 +98,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl
     const ::CCM_DDS::ReadInfo & info)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_2_.handle (t_id.handle ());
-    this->thread_id_2_.id (t_id.id ());
+    this->thread_id_2_ = t_id;
 
     ++this->samples_received_2_;
 
@@ -144,14 +142,14 @@ namespace CIAO_QCTL_Test_Receiver_Impl
   // Receiver_exec_i
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
-    : iterations_ (10),
+    : thread_id_listener_1_ (0, 0),
+      thread_id_listener_2_ (0, 0),
+      iterations_ (10),
       keys_ (5),
       samples_expected_1_ (keys_ * SAMPLES_PER_KEY_1),
       samples_received_1_ (0),
       samples_expected_2_ (keys_ * (this->iterations_ - 4)),
-      samples_received_2_ (0),
-      thread_id_listener_1_ (0, 0),
-      thread_id_listener_2_ (0, 0)
+      samples_received_2_ (0)
   {
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
index a625821eb43..a8cb2dfd618 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
@@ -45,8 +45,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
                                      const ::CCM_DDS::ReadInfo & info)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
     if (!datum.key.in() == 0 &&
         info.instance_status == CCM_DDS::INSTANCE_CREATED)
       {
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
index 854202ae6d4..404944b7f9c 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
@@ -33,8 +33,7 @@ namespace CIAO_Updater_Receiver_Impl
                                   const ::CCM_DDS::ReadInfo & info)
   {
     ACE_Thread_ID t_id;
-    this->thread_id_.handle (t_id.handle ());
-    this->thread_id_.id (t_id.id ());
+    this->thread_id_ = t_id;
 
     ACE_DEBUG ((LM_DEBUG, "ListenOneByOneTest_Listener_exec_i::on_one_data: "
                             "key <%C> - iteration <%d>\n",