Wed Feb 24 15:23:40 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp:
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp:
          Resolved compiler errors.

5 files changed, 26 insertions, 18 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d50de02c7e2..43b3a051c30 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Feb 24 15:23:40 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp:
+          Resolved compiler errors.
+
 Wed Feb 24 15:01:17 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h:
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp
index 29d0f19c1e6..91cee664d62 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp
@@ -214,8 +214,8 @@ namespace CIAO_Writer_Sender_Impl
   {
     DDS::DataWriter_var dds_dw =
       this->context_->get_connection_info_write_dds_entity ();
-    CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd =
-      dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dds_dw.in ());
+    CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd =
+      dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dds_dw.in ());
     DDSDataWriter * p = rti_rd->get_impl ();
     this->writer_ = dynamic_cast <WriterTestDataWriter *> (p);
   }
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
index 9ffec0df7b0..13e89da3498 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
@@ -218,8 +218,8 @@ namespace CIAO_Writer_Sender_Impl
   {
     DDS::DataWriter_var dds_dw =
       this->context_->get_connection_info_write_dds_entity ();
-    CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd =
-      dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dds_dw.in ());
+    CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd =
+      dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dds_dw.in ());
     DDSDataWriter * p = rti_rd->get_impl ();
     this->dds_writer_ = dynamic_cast <WriterTestDataWriter *> (p);
     this->ccm_writer_ = this->context_->get_connection_info_write_data ();
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
index ca591b99283..2ce802f3c73 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
@@ -46,8 +46,8 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw1 =
           this->context_->get_connection_write1_dds_entity ();
-        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd1 =
-           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw1.in ());
+        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd1 =
+           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw1.in ());
         DDSDataWriter * dds_dw1 = rti_rd1->get_impl ();
         DDSPublisher * dds_p1 = dds_dw1->get_publisher ();
         this->dds_dp1_ = dds_p1->get_participant ();
@@ -61,8 +61,8 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw2 =
           this->context_->get_connection_write2_dds_entity ();
-        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd2 =
-           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw2.in ());
+        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd2 =
+           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw2.in ());
         DDSDataWriter * dds_dw2 = rti_rd2->get_impl ();
         DDSPublisher * dds_p2 = dds_dw2->get_publisher ();
         this->dds_dp2_ = dds_p2->get_participant ();
@@ -76,8 +76,8 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw3 =
           this->context_->get_connection_write3_dds_entity ();
-        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd3 =
-           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw3.in ());
+        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd3 =
+           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw3.in ());
         DDSDataWriter * dds_dw3 = rti_rd3->get_impl ();
         DDSPublisher * dds_p3 = dds_dw3->get_publisher ();
         this->dds_dp3_ = dds_p3->get_participant ();
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
index faa1ec34818..7431f179ebc 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
@@ -56,8 +56,8 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw1 =
           this->context_->get_connection_write1_dds_entity ();
-        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd1 =
-           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw1.in ());
+        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd1 =
+           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw1.in ());
         DDSDataWriter * dds_dw1 = rti_rd1->get_impl ();
         DDSPublisher * dds_p1 = dds_dw1->get_publisher ();
         this->dds_dp1_ = dds_p1->get_participant ();
@@ -74,8 +74,8 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw2 =
           this->context_->get_connection_write2_dds_entity ();
-        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd2 =
-           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw2.in ());
+        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd2 =
+           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw2.in ());
         DDSDataWriter * dds_dw2 = rti_rd2->get_impl ();
         DDSPublisher * dds_p2 = dds_dw2->get_publisher ();
         this->dds_dp2_ = dds_p2->get_participant ();
@@ -92,8 +92,8 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw3 =
           this->context_->get_connection_write3_dds_entity ();
-        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd3 =
-           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw3.in ());
+        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd3 =
+           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw3.in ());
         DDSDataWriter * dds_dw3 = rti_rd3->get_impl ();
         DDSPublisher * dds_p3 = dds_dw3->get_publisher ();
         this->dds_dp3_ = dds_p3->get_participant ();
@@ -110,8 +110,8 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw4 =
           this->context_->get_connection_write4_dds_entity ();
-        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd4 =
-           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw4.in ());
+        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd4 =
+           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw4.in ());
         DDSDataWriter * dds_dw4 = rti_rd4->get_impl ();
         DDSPublisher * dds_p4 = dds_dw4->get_publisher ();
         this->dds_dp4_ = dds_p4->get_participant ();