1 files changed, 9 insertions, 21 deletions
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 3ac075d66e0..b9f61a67120 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -1,5 +1,5 @@
-#include "tao/RTScheduling/Current.h"
-#include "tao/RTScheduling/Distributable_Thread.h"
+#include "Current.h"
+#include "Distributable_Thread.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "tao/RTCORBA/RT_Current.h"
 #include "tao/ORB_Core.h"
@@ -13,7 +13,6 @@ ACE_RCSID (RTScheduling,
            Current,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter;
 
@@ -26,12 +25,10 @@ TAO_DTId_Hash::operator () (const IdType &id) const
 
 TAO_RTScheduler_Current::TAO_RTScheduler_Current (void)
 {
-}
 
-TAO_RTScheduler_Current::~TAO_RTScheduler_Current (void)
-{
 }
 
+
 void
 TAO_RTScheduler_Current::init (TAO_ORB_Core* orb
                                ACE_ENV_ARG_DECL)
@@ -328,19 +325,15 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (
     previous_current_ (prev_current),
     dt_hash_ (dt_hash)
 {
-  CORBA::Object_var scheduler_obj =
+  CORBA::Object_ptr scheduler_obj =
     orb->object_ref_table ().resolve_initial_reference (
       "RTScheduler");
 
-  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ()
+  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj
                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
-TAO_RTScheduler_Current_i::~TAO_RTScheduler_Current_i (void)
-{
-}
-
 void
 TAO_RTScheduler_Current_i::begin_scheduling_segment(
   const char * name,
@@ -643,11 +636,6 @@ DTTask::DTTask (//ACE_Thread_Manager *manager,
 {
 }
 
-DTTask::~DTTask (void)
-{
-  delete this->current_;
-}
-
 int
 DTTask::svc (void)
 {
@@ -685,6 +673,7 @@ DTTask::svc (void)
   return 0;
 }
 
+
 RTScheduling::Current::IdType *
 TAO_RTScheduler_Current_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -736,9 +725,9 @@ TAO_RTScheduler_Current_i::name (void)
   return CORBA::string_dup (this->name_.in ());
 }
 
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 void
 TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
@@ -812,7 +801,7 @@ TAO_RTScheduler_Current_i::id (RTScheduling::Current::IdType guid)
 }
 
 void
-TAO_RTScheduler_Current_i::name (const char * name)
+TAO_RTScheduler_Current_i::name (char * name)
 {
   this->name_ = CORBA::string_dup (name);
 }
@@ -991,4 +980,3 @@ const char* TAO_RTScheduler_Current::_interface_repository_id (void) const
   return "IDL:TAO_RTScheduler_Current:1.0";
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL