From e7b2160713036c63508affd9a9d2b52a74200803 Mon Sep 17 00:00:00 2001 From: yamuna Date: Sun, 27 Jul 2003 23:41:57 +0000 Subject: ChangelogTag: Sun Jul 27 19:31:27 2003 Yamuna Krishnamurthy --- TAO/examples/RTScheduling/FP_SchedulingC.h | 2 +- .../Fixed_Priority_Scheduler/FP_DT_Creator.h | 1 - .../RTScheduling/Fixed_Priority_Scheduler/Makefile | 48 ++++++++-------------- .../RTScheduling/MIF_Scheduler/MIF_DT_Creator.h | 1 - TAO/examples/RTScheduling/MIF_Scheduler/Makefile | 48 ++++++++-------------- TAO/examples/RTScheduling/MIF_SchedulingC.h | 2 +- TAO/examples/RTScheduling/Thread_Task.h | 1 - 7 files changed, 36 insertions(+), 67 deletions(-) diff --git a/TAO/examples/RTScheduling/FP_SchedulingC.h b/TAO/examples/RTScheduling/FP_SchedulingC.h index 890981b491c..2364e1deea3 100644 --- a/TAO/examples/RTScheduling/FP_SchedulingC.h +++ b/TAO/examples/RTScheduling/FP_SchedulingC.h @@ -39,7 +39,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTScheduling/RTSchedulerC.h" +#include "tao/RTScheduling/RTScheduler.h" #include "tao/RTCORBA/RTCORBAC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h index ad5d5e5e09b..0df006bf9bb 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h @@ -5,7 +5,6 @@ #include "../DT_Creator.h" #include "fp_dt_creator_export.h" -#include "../Task.h" class FP_DT_Creator_Export FP_DT_Creator: public DT_Creator { diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile index f2552542d09..5d03297135e 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Makefile @@ -74,9 +74,6 @@ realclean: clean FP_Scheduler.h \ $(TAO_ROOT)/tao/RTScheduling/RTScheduler.h \ $(TAO_ROOT)/tao/RTScheduling/rtscheduler_export.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -147,7 +144,6 @@ realclean: clean $(ACE_ROOT)/ace/Time_Value.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ - $(ACE_ROOT)/ace/os_include/os_semaphore.h \ $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ @@ -181,7 +177,6 @@ realclean: clean $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Synch.h \ @@ -224,6 +219,11 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.i \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Signal.i \ @@ -245,11 +245,9 @@ realclean: clean $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -325,6 +323,8 @@ realclean: clean $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \ $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \ $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -334,8 +334,6 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/ServicesC.h \ $(TAO_ROOT)/tao/ServicesC.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ObjectIdListC.h \ $(TAO_ROOT)/tao/ObjectIdListC.i \ $(TAO_ROOT)/tao/objectid.h \ @@ -481,11 +479,6 @@ realclean: clean ../Job_i.h ../JobS.h ../JobC.h ../JobC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ @@ -494,7 +487,7 @@ realclean: clean ../JobS_T.h ../JobS_T.i ../JobS_T.cpp ../JobS.i ../Task_Stats.h \ ../Task_Stats.inl ../Synch_i.h ../SynchS.h ../SynchC.h ../SynchC.i \ ../SynchS_T.h ../SynchS_T.i ../SynchS_T.cpp ../SynchS.i \ - fp_dt_creator_export.h ../Task.h \ + fp_dt_creator_export.h \ $(TAO_ROOT)/tao/RTScheduling/RTScheduler_Manager.h \ $(TAO_ROOT)/tao/RTScheduling/RTScheduler_Manager.i \ ../Thread_Task.h @@ -503,9 +496,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -574,7 +564,6 @@ realclean: clean $(ACE_ROOT)/ace/Time_Value.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ - $(ACE_ROOT)/ace/os_include/os_semaphore.h \ $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ @@ -608,7 +597,6 @@ realclean: clean $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Synch.h \ @@ -651,6 +639,11 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.i \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Signal.i \ @@ -672,11 +665,9 @@ realclean: clean $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -752,6 +743,8 @@ realclean: clean $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \ $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \ $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -761,8 +754,6 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/ServicesC.h \ $(TAO_ROOT)/tao/ServicesC.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ObjectIdListC.h \ $(TAO_ROOT)/tao/ObjectIdListC.i \ $(TAO_ROOT)/tao/objectid.h \ @@ -821,11 +812,6 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h index 1490f8f4b8f..a286090d00c 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h @@ -5,7 +5,6 @@ #include "../DT_Creator.h" #include "mif_dt_creator_export.h" -#include "../Task.h" class MIF_DT_Creator_Export MIF_DT_Creator: public DT_Creator { diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile index fe583f91b01..0b13623b52e 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/Makefile +++ b/TAO/examples/RTScheduling/MIF_Scheduler/Makefile @@ -75,9 +75,6 @@ realclean: clean MIF_Scheduler.h \ $(TAO_ROOT)/tao/RTScheduling/RTScheduler.h \ $(TAO_ROOT)/tao/RTScheduling/rtscheduler_export.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -148,7 +145,6 @@ realclean: clean $(ACE_ROOT)/ace/Time_Value.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ - $(ACE_ROOT)/ace/os_include/os_semaphore.h \ $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ @@ -182,7 +178,6 @@ realclean: clean $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Synch.h \ @@ -225,6 +220,11 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.i \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Signal.i \ @@ -246,11 +246,9 @@ realclean: clean $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -326,6 +324,8 @@ realclean: clean $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \ $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \ $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -335,8 +335,6 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/ServicesC.h \ $(TAO_ROOT)/tao/ServicesC.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ObjectIdListC.h \ $(TAO_ROOT)/tao/ObjectIdListC.i \ $(TAO_ROOT)/tao/objectid.h \ @@ -390,11 +388,6 @@ realclean: clean $(ACE_ROOT)/ace/Notification_Strategy.h \ $(ACE_ROOT)/ace/Notification_Strategy.inl \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -495,7 +488,7 @@ realclean: clean ../JobS_T.h ../JobS_T.i ../JobS_T.cpp ../JobS.i ../Task_Stats.h \ ../Task_Stats.inl ../Synch_i.h ../SynchS.h ../SynchC.h ../SynchC.i \ ../SynchS_T.h ../SynchS_T.i ../SynchS_T.cpp ../SynchS.i \ - mif_dt_creator_export.h ../Task.h \ + mif_dt_creator_export.h \ $(TAO_ROOT)/tao/RTScheduling/RTScheduler_Manager.h \ $(TAO_ROOT)/tao/RTScheduling/RTScheduler_Manager.i \ ../Thread_Task.h @@ -504,9 +497,6 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ @@ -575,7 +565,6 @@ realclean: clean $(ACE_ROOT)/ace/Time_Value.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/os_include/os_pthread.h \ - $(ACE_ROOT)/ace/os_include/os_semaphore.h \ $(ACE_ROOT)/ace/os_include/os_assert.h \ $(ACE_ROOT)/ace/os_include/os_fcntl.h \ $(ACE_ROOT)/ace/os_include/sys/os_stat.h \ @@ -609,7 +598,6 @@ realclean: clean $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Synch.h \ @@ -652,6 +640,11 @@ realclean: clean $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.i \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Signal.i \ @@ -673,11 +666,9 @@ realclean: clean $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor_Timer_Interface.h \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -753,6 +744,8 @@ realclean: clean $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \ $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \ $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -762,8 +755,6 @@ realclean: clean $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/ServicesC.h \ $(TAO_ROOT)/tao/ServicesC.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ObjectIdListC.h \ $(TAO_ROOT)/tao/ObjectIdListC.i \ $(TAO_ROOT)/tao/objectid.h \ @@ -822,11 +813,6 @@ realclean: clean $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(ACE_ROOT)/ace/Atomic_Op.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.h \ - $(ACE_ROOT)/ace/Atomic_Op_T.i \ - $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.h b/TAO/examples/RTScheduling/MIF_SchedulingC.h index fdda5d03a4b..40716ae8783 100644 --- a/TAO/examples/RTScheduling/MIF_SchedulingC.h +++ b/TAO/examples/RTScheduling/MIF_SchedulingC.h @@ -39,7 +39,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTScheduling/RTSchedulerC.h" +#include "tao/RTScheduling/RTScheduler.h" #include "tao/RTCORBA/RTCORBAC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/examples/RTScheduling/Thread_Task.h b/TAO/examples/RTScheduling/Thread_Task.h index 53172c59f89..3b79b814909 100644 --- a/TAO/examples/RTScheduling/Thread_Task.h +++ b/TAO/examples/RTScheduling/Thread_Task.h @@ -6,7 +6,6 @@ //#include "FP_Scheduler.h" #include "ace/Task.h" #include "DT_Creator.h" -#include "Task.h" class Task_Stats; class DT_Creator; -- cgit v1.2.1