1 files changed, 11 insertions, 8 deletions

diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
index 137bcc7126a..873abdd819a 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
+++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
@@ -5,11 +5,14 @@
 #include "tao/RTScheduling/RTScheduler.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
+#include "ace/SString.h"
+
+#include "tao/RTScheduling/RTSchedulerC.h"
 
 class Data
 {
  public:
-  char* data;
+  ACE_CString data;
   RTScheduling::Current_var current;
 };
 
@@ -40,29 +43,29 @@ Test_Thread_Action::_cxx_do (CORBA::VoidData data
   Data* tmp = (Data*) data;
   ACE_DEBUG ((LM_DEBUG,
 	      "Test_Thread_Action::do %s\n",
-	      tmp->data));
+	      tmp->data.c_str ()));
 
   size_t count = 0;
   ACE_OS::memcpy (&count,
 		  tmp->current->id ()->get_buffer (),
 		  tmp->current->id ()->length ());
-  
+
   ACE_DEBUG ((LM_DEBUG,
 	      "The spawned DT Guid is %d\n",
 	      count));
-  
-  RTScheduling::Current::NameList* segment_name_list = 
+
+  RTScheduling::Current::NameList_var segment_name_list =
     tmp->current->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   ACE_DEBUG ((LM_DEBUG,
 	      "Segment Names for DT %d:\n",
 	      count));
-  
+
   for (unsigned int i = 0; i < segment_name_list->length (); i ++)
     {
       ACE_DEBUG ((LM_DEBUG,
 		  "%s\n",
-		  CORBA::string_dup ((*segment_name_list) [i])));
+      static_cast<char const*>((*segment_name_list) [i])));
     }
 }