1 files changed, 5 insertions, 6 deletions
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 985d16e8aa5..13e89da3498 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
@@ -2,14 +2,13 @@
 // $Id$
 
 #include "Writer_Sender_exec.h"
+#include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
 #include "ace/Reactor.h"
 
 #include "Base/Writer_BaseSupport.h"
-#include "dds4ccm/impl/dds/Utils.h"
-#include "dds4ccm/impl/dds/ndds/InstanceHandle_t.h"
-
-#include "ciao/Logger/Log_Macros.h"
+#include "dds4ccm/impl/ndds/Utils.h"
+#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 
 namespace CIAO_Writer_Sender_Impl
 {
@@ -219,9 +218,9 @@ namespace CIAO_Writer_Sender_Impl
   {
     DDS::DataWriter_var dds_dw =
       this->context_->get_connection_info_write_dds_entity ();
-    CIAO::DDS4CCM::CCM_DDS_DataWriter_i *ccm_dds_rd =
+    CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd =
       dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dds_dw.in ());
-    DDSDataWriter * p = ccm_dds_rd->get_impl ();
+    DDSDataWriter * p = rti_rd->get_impl ();
     this->dds_writer_ = dynamic_cast <WriterTestDataWriter *> (p);
     this->ccm_writer_ = this->context_->get_connection_info_write_data ();
   }