diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-12-30 13:29:31 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-12-30 13:29:31 +0000 |
commit | c5329bf429c79f76c6daccf686d3f68c1484b23f (patch) | |
tree | 5d97fa03a5cd032aa9b854d4044aecf4f7691f4c /TAO | |
parent | fd4e939d5417249a9326b6d53fdeae1ba96e7b6a (diff) | |
download | ATCD-c5329bf429c79f76c6daccf686d3f68c1484b23f.tar.gz |
ChangeLogTag: Tue Dec 30 13:22:56 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h | 13 |
3 files changed, 7 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 132dddbcf45..fdb584d3736 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Dec 30 13:22:56 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/simple.cpp: + Removed not needed ; after ACE_RCSID to fix Tru64 warning + Tue Dec 30 13:09:43 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp: diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h index ae6cf998b2a..e14252adbee 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h @@ -51,8 +51,6 @@ #ifndef RTCOSSCHEDULING_SERVER_CONTAINERS #define RTCOSSCHEDULING_SERVER_CONTAINERS -class TAO::PCP_Manager; - /** * CosSchedulingObjectNameMap * diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h index 2d3ea802b0f..84c5d0c9b4f 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h +++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.h @@ -14,30 +14,19 @@ #define Object1_I_H #include "testSchedS.h" -//#include "tao/RTCORBA/RTCORBA.h" -//##include "ace/Task.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -//#include "ace/CORBA_macros.h" -//#include "tao/RTCORBA/Priority_Mapping_Manager.h" -//#include "tao/corba.h" -//#include "tao/ORB_Core.h" - - - /** * @class Object1_i * * @brief This class is used to test the RTCORBA 1.0 Scheduling Service * */ - - class Object1_impl : public POA_testSched::Object1, - PortableServer::RefCountServantBase + public PortableServer::RefCountServantBase { public: Object1_impl() |