diff options
Diffstat (limited to 'TAO/examples')
9 files changed, 21 insertions, 27 deletions
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h index 77c52f15dc5..1a73a5260b8 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h @@ -47,7 +47,7 @@ struct EDF_Scheduler_Traits class Kokyu_DSRT_Schedulers_Export EDF_Sched_Param_Policy: public EDF_Scheduling::SchedulingParameterPolicy, - public TAO_Local_RefCounted_Object + public ::CORBA::LocalObject { public: @@ -61,7 +61,7 @@ public EDF_Scheduling::SchedulingParameterPolicy, class Kokyu_DSRT_Schedulers_Export EDF_Scheduler: public EDF_Scheduling::Scheduler, -public TAO_Local_RefCounted_Object +public ::CORBA::LocalObject { public: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp index 0783dd864f3..faa4755a807 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp @@ -12,28 +12,24 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy () } FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy ( - const FP_Segment_Sched_Param_Policy &rhs - ) + const FP_Segment_Sched_Param_Policy &rhs) : CORBA::Object (), CORBA::Policy (), - CORBA::LocalObject (), FP_Scheduling::SegmentSchedulingParameterPolicy (), - TAO_Local_RefCounted_Object (), + CORBA::LocalObject (), value_ (rhs.value_) { } FP_Scheduling::SegmentSchedulingParameter -FP_Segment_Sched_Param_Policy::value ( - ) +FP_Segment_Sched_Param_Policy::value (void) { return value_; } void FP_Segment_Sched_Param_Policy::value ( - const FP_Scheduling::SegmentSchedulingParameter & value - ) + const FP_Scheduling::SegmentSchedulingParameter & value) { this->value_ = value; } @@ -41,7 +37,7 @@ FP_Segment_Sched_Param_Policy::value ( CORBA::Policy_ptr FP_Segment_Sched_Param_Policy::copy (void) { - FP_Segment_Sched_Param_Policy* tmp; + FP_Segment_Sched_Param_Policy* tmp = 0; ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h index ea2f0dd541e..a18f8c519b4 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h @@ -39,7 +39,7 @@ struct FP_Scheduler_Traits class Kokyu_DSRT_Schedulers_Export FP_Segment_Sched_Param_Policy: public FP_Scheduling::SegmentSchedulingParameterPolicy, - public TAO_Local_RefCounted_Object + public ::CORBA::LocalObject { public: FP_Segment_Sched_Param_Policy (); @@ -62,7 +62,7 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy, class Kokyu_DSRT_Schedulers_Export Fixed_Priority_Scheduler: public FP_Scheduling::FP_Scheduler, -public TAO_Local_RefCounted_Object +public ::CORBA::LocalObject { public: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp index c3ee1477ae5..5791fdc4f8e 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp @@ -16,9 +16,8 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy ( ) : CORBA::Object (), CORBA::Policy (), - CORBA::LocalObject (), MIF_Scheduling::SchedulingParameterPolicy (), - TAO_Local_RefCounted_Object (), + CORBA::LocalObject (), value_ (rhs.value_) { } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h index cf1829ccb50..6fb40c9c717 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h @@ -39,7 +39,7 @@ struct MIF_Scheduler_Traits class Kokyu_DSRT_Schedulers_Export MIF_Sched_Param_Policy: public MIF_Scheduling::SchedulingParameterPolicy, - public TAO_Local_RefCounted_Object + public ::CORBA::LocalObject { public: MIF_Sched_Param_Policy (); @@ -59,7 +59,7 @@ public MIF_Scheduling::SchedulingParameterPolicy, class Kokyu_DSRT_Schedulers_Export MIF_Scheduler: public MIF_Scheduling::Scheduler, -public TAO_Local_RefCounted_Object +public ::CORBA::LocalObject { public: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp index 1fb9e9a896d..9e84dcec991 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp @@ -16,9 +16,8 @@ MUF_Sched_Param_Policy::MUF_Sched_Param_Policy ( ) : CORBA::Object (), CORBA::Policy (), - CORBA::LocalObject (), MUF_Scheduling::SchedulingParameterPolicy (), - TAO_Local_RefCounted_Object (), + CORBA::LocalObject (), value_ (rhs.value_) { } @@ -38,7 +37,7 @@ MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value) CORBA::Policy_ptr MUF_Sched_Param_Policy::copy (void) { - MUF_Sched_Param_Policy* tmp; + MUF_Sched_Param_Policy* tmp = 0; ACE_NEW_THROW_EX (tmp, MUF_Sched_Param_Policy (*this), CORBA::NO_MEMORY (TAO::VMCID, diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h index e9b70810567..abaa4226cd0 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h @@ -55,7 +55,7 @@ struct MUF_Scheduler_Traits class Kokyu_DSRT_Schedulers_Export MUF_Sched_Param_Policy: public MUF_Scheduling::SchedulingParameterPolicy, - public TAO_Local_RefCounted_Object + public ::CORBA::LocalObject { public: MUF_Sched_Param_Policy (); @@ -75,7 +75,7 @@ public MUF_Scheduling::SchedulingParameterPolicy, class Kokyu_DSRT_Schedulers_Export MUF_Scheduler: public MUF_Scheduling::Scheduler, -public TAO_Local_RefCounted_Object +public ::CORBA::LocalObject { public: diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h index 97d6fa90153..fd3b7524a1f 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h @@ -9,7 +9,7 @@ class Segment_Sched_Param_Policy: public FP_Scheduling::SegmentSchedulingParameterPolicy, - public TAO_Local_RefCounted_Object + public ::CORBA::LocalObject { public: virtual RTCORBA::Priority value (void); @@ -26,7 +26,7 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy, class Fixed_Priority_Scheduler: public FP_Scheduling::FP_Scheduler, -public TAO_Local_RefCounted_Object +public ::CORBA::LocalObject { public: @@ -91,7 +91,7 @@ public TAO_Local_RefCounted_Object virtual char * scheduling_discipline_name (void); - virtual RTScheduling::ResourceManager_ptr + virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, CORBA::Policy_ptr scheduling_parameter); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h index 70ef49412e7..094d4ae56bf 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h @@ -32,7 +32,7 @@ class DT : public ACE_Message_Block class Segment_Sched_Param_Policy: public MIF_Scheduling::SegmentSchedulingParameterPolicy, - public TAO_Local_RefCounted_Object + public ::CORBA::LocalObject { public: virtual CORBA::Short importance (void); @@ -51,7 +51,7 @@ typedef ACE_Message_Queue<ACE_NULL_SYNCH> DT_Message_Queue; class MIF_Scheduler: public MIF_Scheduling::MIF_Scheduler, -public TAO_Local_RefCounted_Object +public ::CORBA::LocalObject { public: |