diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-06-14 09:00:34 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-06-14 09:00:34 +0000 |
| commit | 9f14467f0192daac12832e5fedddf9d4f2315f97 (patch) | |
| tree | b0173256846b6b06e70132b54f86ae28270689b3 | |
| parent | ce6c4643b7e77f776b73b004195d92566ffa3e3b (diff) | |
| download | ATCD-9f14467f0192daac12832e5fedddf9d4f2315f97.tar.gz | |
ChangeLogTag: Tue Jun 14 08:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
99 files changed, 582 insertions, 184 deletions
diff --git a/ChangeLog b/ChangeLog index e1e93d1d05f..316bd7df305 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jun 14 08:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/interceptors.mpb: + * bin/MakeProjectCreator/config/portableserver.mpb: + * bin/MakeProjectCreator/config/rtcorba.mpb: + * bin/MakeProjectCreator/config/utils.mpb: + Added pi as base project + Mon Jun 13 13:50:53 2005 Emre Turkay <turkaye@dre.vanderbilt.edu> * bin/ciao_tests.lst: diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 72fb02f2ecf..d63e1bb7209 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,245 @@ +Tue Jun 14 08:41:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/PI/*: + New PI library. Contains ORBInitializer registry, ORBInitInfo and + PolicyFactory. This will be extended in the future with more classes + but this is the first step. If you use any of these classes in + your app, add the include of tao/PI/PI.h to your application code. + This will make sure the service config registry is filled with + the loadable modules. + + * tao/BiDir_GIOP.mpc: + The BiDir library uses a PolicyFactory so it must link with the PI + library + + * tao/Interceptor_List.{h,cpp}: + Changed the list to return a value indicating whether it was possible + to add the interceptor or not. The caller in the PI or IORInterceptor + library will then throw the correct exception. This way the list + template can stay in the TAO lib because the exception DuplicateName + is now in the PI library + + * tao/IORInterceptor.mpc: + Added PI as base project + + * tao/IORInterceptor_Adapter.{h,cpp}: + Removed throw clause from add_interceptor method. The clause was + not correct also, it could throw a DuplicateName exception also. + This way we are not dependent on the PI library. Also the adapter + doesn't need to be derived from ACE_Service_Object, this class + is not loaded, the factory that creates it is. + + * tao/IORInterceptor_Adapter_Factory.{h,cpp}: + Removed destructor, it is not needed + + * tao/ORB.cpp: + Updated to use the new ORBInitializer Factory adapter and Policy + Factory adapter + + * tao/ORB_Core.{h,cpp,i}: + Updated for new adapters and interceptor list changes. Also added + a get_orbinitializer_registry which returns the current pointer + without trying to load the PI library. This is used by the ORB + to call alls orbinitializers. When the library is not loaded yet, + no user code caused this so we don't have to do this also + + * tao/ORBInitializer.pidl: + * tao/ORBInitializerA.cpp: + * tao/ORBInitializerC.{h,cpp,inl}: + * tao/ORBInitializerS.h: + * tao/ORBInitInfo.pidl: + * tao/ORBInitInfoA.cpp: + * tao/ORBInitInfoC.{h,cpp,inl}: + * tao/ORBInitInfoS.h: + * tao/ORBInitInfo.{h,cpp,inl}: + * tao/PolicyFactory.pidl: + * tao/PolicyFactory_Registry.{h,cpp}: + * tao/PolicyFactoryA.cpp: + * tao/PolicyFactoryC.{h,cpp,inl}: + Moved to the PI library + + * tao/IOP_Codec.pidl: + * tao/IOP_CodecA.cpp: + * tao/IOP_CodecC.{h,cpp,inl}: + Moved to the CodecFactory library + + * tao/IOP.pidl: + Removed include of IOP_Codec.pidl + + * tao/ORBInitializer_Registry.{h,cpp}: + Removed all code except register_orb_initializer, which now tries + to load the ORBInitializer Registry on demand. The code is moved to + the PI library + + * tao/PI.mpc: + New file + + * tao/PolicyFactory_Registry_Adapter.{h,cpp}: + New adapter for PolicyFactory_Registry + + * tao/PolicyFactory_Registry_Factory.h: + New factory for creating a PolicyFactory for each ORB + + * tao/PortableInterceptor.pidl: + Removed files that moved to the PI library + + * tao/PortableInterceptorA.cpp: + Removed, empty + + * tao/PortableInterceptorC.{cpp,h}: + Regenerated + + * tao/PortableServer.mpc: + * tao/RTCORBA.mpc: + * tao/Utils.mpc + Based on the new PI. These all use something of the PI library. + Because of this only a client gets benefits from this, but the + server will be handled in the next iteration + + * tao/tao.mpc: + Updated for all changes + + * tao/BiDir_GIOP/BiDirGIOP.cpp: + Added include of ORBInitializer_Registry.h + + * tao/BiDir_GIOP/BiDir_ORBInitializer.{h,cpp}: + * tao/BiDir_GIOP/BiDir_PolicyFactory.h: + Include tao/PI/PI.h + + * tao/CodecFactory/CodecFactory.h: + Include IOP_CodecC.h + + * tao/CodecFactory/IOP_CodecC.{h,cpp}: + * tao/CodecFactory/IOP_CodecA.cpp: + * tao/CodecFactory/IOP_CodecS.h: + Files moved from the tao lib + + * tao/CodecFactory/IOP_Codec_include.pidl: + * tao/CodecFactory/IOP_Codec_includeC.h: + * tao/CodecFactory/IOP_Codec_includeS.h: + New files for apps that include IOP_Codec.pidl in the past, they + should now use this pidl file + + * tao/CodecFactory/CDR_Encaps_Codec.h: + * tao/CodecFactory/CodecFactory.h: + * tao/CodecFactory/CodecFactory_imp.h: + Updated for moving of IOP_Codec.pidl + + * tao/IORInterceptor/IORInterceptor_Adapter_Impl.{h,cpp}: + Updated for interceptor list change + + * tao/Messaging/Messaging_ORBInitializer.h: + * tao/Messaging/Messaging_PolicyFactory.h: + * tao/PortableServer/PortableServer_ORBInitializer.{h,cpp}: + * tao/PortableServer/PortableServer_PolicyFactory.h: + * tao/RTCORBA/RT_ORBInitializer.cpp: + * tao/RTCORBA/RT_PolicyFactory.h + * tao/RTScheduling/RTScheduling_Initializer.{h,cpp}: + * tao/Utils/RIR_Narrow.h: + Changed includes to include tao/PI/PI.h + + * tao/docs/libraries.html: + Added PI + + * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc + * orbsvcs/examples/LoadBalancing/ORBInitializer.h + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp + * orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h + * orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp + * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h + * orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h + * orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h + * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h + * orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp + * orbsvcs/orbsvcs/Security/Security_ORBInitializer.h + * orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp + * orbsvcs/orbsvcs/Security/Security_PolicyFactory.h + * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp + * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp + * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h + * orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc + * tests/Bug_1495_Regression/Bug_1495.mpc + * tests/Bug_1495_Regression/Client_ORBInitializer.h + * tests/Bug_1495_Regression/Server_ORBInitializer.h + * tests/ORT/ORT.mpc + * tests/ORT/ServerORBInitializer.h + * tests/Portable_Interceptors/AMI/Client_ORBInitializer.h + * tests/Portable_Interceptors/AMI/Server_ORBInitializer.h + * tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h + * tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h + * tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h + * tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h + * tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h + * tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp + * tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp + * tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h + * tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc + * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h + * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc + * tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h + * tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h + * tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h + * tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h + * tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h + * tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h + * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h + * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h + * tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h + * tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h + * tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp + * tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h + * tests/Portable_Interceptors/PICurrent/client.cpp + * tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h + * tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h + * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h + * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h + * tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h + * tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h + Updated for the new PI library + + * tests/RTCORBA/check_supported_priorities.cpp + * tests/RTCORBA/common_args.cpp + * tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp + * tests/RTCORBA/Banded_Connections/client.cpp + * tests/RTCORBA/Banded_Connections/server.cpp + * tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h + * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc + * tests/RTCORBA/Client_Propagated/client.cpp + * tests/RTCORBA/Client_Propagated/server.cpp + * tests/RTCORBA/Collocation/Collocation.cpp + * tests/RTCORBA/Linear_Priority/client.cpp + * tests/RTCORBA/Linear_Priority/server.cpp + * tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp + * tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp + * tests/RTCORBA/Policy_Combinations/client.cpp + * tests/RTCORBA/Policy_Combinations/server.cpp + * tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp + * tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp + * tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp + * tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp + * tests/RTCORBA/Server_Declared/server.cpp + * tests/RTCORBA/Thread_Pool/client.cpp + * tests/RTCORBA/Thread_Pool/server.cpp + Instead of doing an ACE_OS::exit() when the needed priorities + are not available, return from the main with a -1. Will reduce + the number of memory leaks reported by valgrind a lot. + Tue Jun 14 07:38:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp: diff --git a/TAO/docs/libraries.html b/TAO/docs/libraries.html index d0f0a36d3ce..d441cc0f7fb 100644 --- a/TAO/docs/libraries.html +++ b/TAO/docs/libraries.html @@ -162,6 +162,16 @@ and the dependencies outlined below are the same. <P> <td>objreftemplate.mpb</td> </tr> <tr align=left> + <th>libTAO_PI.so</th> + <td>Support for Portalbe Interceptors. This library is automagically + loaded by + the ORB when the application uses the PolicyFactory or ORBInitializer + . Just linking this library should be sufficient to + get all the features that are required to write applications + using portable intercetpros. </td> + <td>pi.mpb</td> + </tr> + <tr align=left> <th>libTAO_PortableServer.so</th> <td>Support for POA. This library is automagically loaded by the ORB when the application calls resolve_intial_references diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc index a10fd0f0bcd..4b7dece36d4 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc @@ -1,8 +1,5 @@ // $Id$ -project(*Server): orbsvcsexe, fault_tolerance, tmcast { - requires += interceptors - includes += $(TAO_ROOT)/orbsvcs - +project(*Server): orbsvcsexe, fault_tolerance, tmcast, interceptors { Source_Files { RolyPoly_i.cpp ORB_Initializer.cpp @@ -13,8 +10,6 @@ project(*Server): orbsvcsexe, fault_tolerance, tmcast { } project(*Client): taoexe, fault_tolerance, exceptions { - includes += $(TAO_ROOT)/orbsvcs - Source_Files { RolyPolyC.cpp client.cpp diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h index c0412111008..b366f733e93 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index 270378879cc..11daa44e90d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -89,9 +89,6 @@ TAO_FT_ClientORBInitializer::register_policy_factories ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; */ - - // Transfer ownership of the policy factory to the registry. - (void) policy_factory._retn (); } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h index 15699a29b38..d5fd561e3ad 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -/// RTCORBA ORB initializer. +/// FT ORB initializer. class TAO_FT_ClientORB_Export TAO_FT_ClientORBInitializer : public virtual PortableInterceptor::ORBInitializer, public virtual TAO_Local_RefCounted_Object diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 7da3391fdd8..5a1b5dd4e2d 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -7,9 +7,8 @@ #include "orbsvcs/FT_CORBA_ORBC.h" #include "tao/PolicyC.h" - -ACE_RCSID (FaultTolerance, - FT_ClientPolicyFactory, +ACE_RCSID (FaultTolerance, + FT_ClientPolicyFactory, "$Id$") @@ -23,8 +22,8 @@ TAO_FT_ClientPolicyFactory::create_policy ( { if (type == FT::REQUEST_DURATION_POLICY) - return TAO_FT_Request_Duration_Policy::create (val - ACE_ENV_ARG_PARAMETER); + return TAO_FT_Request_Duration_Policy::create (val + ACE_ENV_ARG_PARAMETER); else if (type == FT::HEARTBEAT_POLICY) return TAO_FT_Heart_Beat_Policy::create (val ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h index 621faab51b4..6d05145d5fc 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h @@ -16,8 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" - +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index bca168a930c..23d4f0e163b 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -58,7 +58,7 @@ CORBA::Policy_ptr TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_FT_Request_Duration_Policy* tmp; + TAO_FT_Request_Duration_Policy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); @@ -112,12 +112,12 @@ CORBA::Policy_ptr TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val ACE_ENV_ARG_DECL) { - FT::HeartbeatPolicyValue *value; + FT::HeartbeatPolicyValue *value = 0; if ((val >>= value) == 0) ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE), CORBA::Policy::_nil ()); - TAO_FT_Heart_Beat_Policy *tmp; + TAO_FT_Heart_Beat_Policy *tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (value->heartbeat, value->heartbeat_interval, @@ -142,7 +142,7 @@ CORBA::Policy_ptr TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_FT_Heart_Beat_Policy * tmp; + TAO_FT_Heart_Beat_Policy * tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this), CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp index db015d0a85a..d46cdb65417 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp @@ -4,6 +4,7 @@ #include "FT_Endpoint_Selector_Factory.h" #include "tao/ORB_Core.h" #include "tao/Service_Callbacks.h" +#include "tao/ORBInitializer_Registry.h" #include "ace/Dynamic_Service.h" ACE_RCSID(FaultTolerance, FT_ClientService_Activate, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index 1696f69d90e..117b2e95280 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -73,8 +73,6 @@ TAO_FT_ServerORBInitializer::register_policy_factories ( policy_factory.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - // Transfer ownership of the policy factory to the registry. - (void) policy_factory._retn (); } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h index 333c7fcd9de..6f88080afd2 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index e06536ee5f6..e6269801482 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -8,13 +8,10 @@ #include "tao/PolicyC.h" -ACE_RCSID (FaultTolerance, - FT_ServerPolicyFactory, +ACE_RCSID (FaultTolerance, + FT_ServerPolicyFactory, "$Id$") - - - CORBA::Policy_ptr TAO_FT_ServerPolicyFactory::create_policy ( CORBA::PolicyType type, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h index 2737921eb8e..fc1cb12b093 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp index 060f8f53d6e..dd9f2313ac3 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp @@ -2,8 +2,8 @@ #include "FT_ServerORBInitializer.h" #include "tao/ORB_Core.h" #include "tao/Service_Callbacks.h" +#include "tao/ORBInitializer_Registry.h" #include "ace/Dynamic_Service.h" -#include <iostream> ACE_RCSID(FaultTolerance, FT_ServerService_Activate, "$Id$") diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h index cf96ce76563..3b08eab9300 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h @@ -23,7 +23,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index aa59c41118a..884b769ffa0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -11,10 +11,6 @@ ACE_RCSID (EventChannel, FTEC_ORBInitializer, "$Id$") -FTEC_ORBInitializer::FTEC_ORBInitializer () -{ -} - void FTEC_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h index f9b471d60f8..947ea61cafa 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h @@ -13,7 +13,7 @@ #define FTEC_ORBINITIALIZER__H_ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -25,8 +25,6 @@ class FTEC_ORBInitializer , public virtual TAO_Local_RefCounted_Object { public: - FTEC_ORBInitializer (); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index 25779e34e8e..a9de93d8b1e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -5,6 +5,7 @@ #include "../Utils/UUID.h" #include "tao/TypeCode.h" +#include "tao/PI/PI.h" #include "tao/IOP_IORC.h" #include "ace/TSS_T.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h index 158b43ea297..38f2f6b3ecb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// -pe*- C++ -*- //============================================================================= /** @@ -22,6 +22,11 @@ class TAO_FTEC_Event_Channel_Impl; +namespace PortableInterceptor +{ + class ORBInitInfo; + typedef ORBInitInfo *ORBInitInfo_ptr; +} /** * @class Request_Context_Repository diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h index 1eec4d5a4e8..818d866a2a6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h index 39ba1616a02..ffac81934f0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index 45387df0c56..935f9661294 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -5,7 +5,7 @@ #include "tao/Exception.h" #include "tao/ORB_Core.h" -#include "tao/ORBInitInfo.h" +#include "tao/PI/ORBInitInfo.h" #include "tao/debug.h" @@ -17,10 +17,6 @@ ACE_RCSID (PortableGroup, static const char pg_poa_factory_name[] = "TAO_PG_POA"; static const char pg_poa_factory_directive[] = "dynamic TAO_PG_POA Service_Object * TAO_PortableGroup:_make_TAO_PG_Object_Adapter_Factory()"; -TAO_PortableGroup_ORBInitializer::TAO_PortableGroup_ORBInitializer (void) -{ -} - void TAO_PortableGroup_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr info @@ -46,7 +42,7 @@ TAO_PortableGroup_ORBInitializer::pre_init ( } // Set a new request dispatcher in the ORB. - PortableGroup_Request_Dispatcher *rd; + PortableGroup_Request_Dispatcher *rd = 0; ACE_NEW_THROW_EX (rd, PortableGroup_Request_Dispatcher (), CORBA::NO_MEMORY ( diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index c0265c079e4..901e76e68d3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -38,9 +38,6 @@ class TAO_PortableGroup_Export TAO_PortableGroup_ORBInitializer : public virtual TAO_Local_RefCounted_Object { public: - - TAO_PortableGroup_ORBInitializer (); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h index dc489db9046..9cf82400061 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index ab155f7e8f6..ad129be0e9e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -14,7 +14,7 @@ ACE_RCSID (Security, #include "orbsvcs/SecurityC.h" -#include "tao/ORBInitInfo.h" +#include "tao/PI/ORBInitInfo.h" #include "tao/ORB_Constants.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index dc173ff4329..ec755fcb406 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #include "Security_PolicyFactory.h" diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 001c74c2ef9..1f79aff69bf 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -15,7 +15,6 @@ ACE_RCSID (Security, #include "orbsvcs/SecurityLevel2C.h" #include "orbsvcs/SecurityLevel3C.h" - #include "tao/ORB_Constants.h" CORBA::Policy_ptr diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index 94c659e8a1d..e9dc2e54fb5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp index bf98cd03930..a7d70ac5c85 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp @@ -2,8 +2,6 @@ #include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h" -//#include "orbsvcs/CosLoadBalancingC.h" - #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h index 2d7e427db21..b288bb12c48 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h index 25366852daf..77132d3adc8 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index e34950d11d5..f6ce3d00373 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -9,6 +9,7 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_errno.h" +#include "tao/ORBInitializer_Registry.h" #include "tao/Strategies/advanced_resource.h" ACE_RCSID (LoadBalancing, diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h index 180a1e64e37..f2c7f5d20e8 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h @@ -26,7 +26,7 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc b/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc index 6519c9666ef..08b932cb774 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc +++ b/TAO/orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTCosScheduling_Server): rtcosscheduling, rt_server, orbsvcsexe { - requires += interceptors +project(RTCosScheduling_Server): rtcosscheduling, rt_server, orbsvcsexe, interceptors { after += commonlib libs += testSched_Common libpaths += . @@ -19,7 +18,6 @@ project(RTCosScheduling_Server): rtcosscheduling, rt_server, orbsvcsexe { project(RTCosScheduling_Client): rtcosscheduling, rt_client, orbsvcsexe { after += commonlib after += RTCosScheduling_Server - requires += interceptors libs += testSched_Common libpaths += . exename = client diff --git a/TAO/tao/PI/diff/ORBInitializer.diff b/TAO/tao/PI/diff/ORBInitializer.diff new file mode 100644 index 00000000000..c9dd1d62fdf --- /dev/null +++ b/TAO/tao/PI/diff/ORBInitializer.diff @@ -0,0 +1,34 @@ +--- orig/ORBInitializerC.h 2005-06-03 13:59:05.470598400 +0200 ++++ ORBInitializerC.h 2005-06-03 14:12:22.646881600 +0200 +@@ -33,6 +33,9 @@ + + #include /**/ "ace/pre.h" + ++ #ifndef TAO_PI_SAFE_INCLUDE ++ #error "You should not include ORBInitializerC.h directly, use PI.h" ++ #endif /* !TAO_PI_SAFE_INCLUDE */ + + #include "ace/config-all.h" + +--- orig/ORBInitializerC.cpp 2005-06-03 13:59:05.470598400 +0200 ++++ ORBInitializerC.cpp 2005-06-03 14:14:33.354830400 +0200 +@@ -29,7 +29,7 @@ + // be\be_codegen.cpp:291 + + +-#include "ORBInitializerC.h" ++#include "PI.h" + #include "tao/CDR.h" + #include "ace/OS_NS_string.h" + +--- orig/ORBInitializerA.cpp 2005-06-03 13:59:05.470598400 +0200 ++++ ORBInitializerA.cpp 2005-06-03 14:14:29.088696000 +0200 +@@ -25,7 +25,7 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#include "ORBInitializerC.h" ++#include "PI.h" + #include "tao/Null_RefCount_Policy.h" + #include "tao/TypeCode_Constants.h" + #include "tao/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI/diff/PolicyFactory.diff b/TAO/tao/PI/diff/PolicyFactory.diff new file mode 100644 index 00000000000..dd03c58c39b --- /dev/null +++ b/TAO/tao/PI/diff/PolicyFactory.diff @@ -0,0 +1,164 @@ +--- orig/PolicyFactoryC.h 2005-04-23 21:12:35.022166400 +0200 ++++ PolicyFactoryC.h 2005-04-15 13:04:39.000000000 +0200 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ + + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -26,7 +26,7 @@ + // http://www.cs.wustl.edu/~schmidt/TAO.html + + // TAO_IDL - Generated from +-// be\be_codegen.cpp:153 ++// .\be\be_codegen.cpp:153 + + #ifndef _TAO_IDL_ORIG_POLICYFACTORYC_H_ + #define _TAO_IDL_ORIG_POLICYFACTORYC_H_ +@@ -66,13 +66,13 @@ + #endif /* __BORLANDC__ */ + + // TAO_IDL - Generated from +-// be\be_visitor_module/module_ch.cpp:48 ++// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48 + + namespace PortableInterceptor + { + + // TAO_IDL - Generated from +- // be\be_interface.cpp:598 ++ // .\be\be_interface.cpp:598 + + #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_) + #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_ +@@ -95,7 +95,7 @@ + #endif /* end #if !defined */ + + // TAO_IDL - Generated from +- // be\be_visitor_interface/interface_ch.cpp:54 ++ // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54 + + #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_) + #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_ +@@ -130,7 +130,7 @@ + static void _tao_any_destructor (void *); + + // TAO_IDL - Generated from +- // be\be_visitor_operation/operation_ch.cpp:46 ++ // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46 + + virtual ::CORBA::Policy_ptr create_policy ( + ::CORBA::PolicyType type, +@@ -142,8 +142,18 @@ + ::CORBA::PolicyError + )) = 0; + ++ // Hand-crafted addition. ++ virtual ::CORBA::Policy_ptr _create_policy ( ++ CORBA::PolicyType type ++ ACE_ENV_ARG_DECL_WITH_DEFAULTS ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ , CORBA::PolicyError ++ )); ++ + // TAO_IDL - Generated from +- // be\be_visitor_interface/interface_ch.cpp:210 ++ // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210 + + virtual CORBA::Boolean _is_a ( + const char *type_id +@@ -169,17 +179,17 @@ + #endif /* end #if !defined */ + + // TAO_IDL - Generated from +- // be\be_visitor_typecode/typecode_decl.cpp:44 ++ // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44 + + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory; + + // TAO_IDL - Generated from +-// be\be_visitor_module/module_ch.cpp:66 ++// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66 + + } // module PortableInterceptor + + // TAO_IDL - Generated from +-// be\be_visitor_traits.cpp:61 ++// .\be\be_visitor_traits.cpp:61 + + // Traits specializations. + namespace TAO +@@ -208,14 +218,14 @@ + } + + // TAO_IDL - Generated from +-// be\be_visitor_interface/any_op_ch.cpp:52 ++// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52 + + TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying + TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying + TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &); + + // TAO_IDL - Generated from +-// be\be_codegen.cpp:955 ++// .\be\be_codegen.cpp:955 + + #if defined(_MSC_VER) + #pragma warning(pop) +--- orig/PolicyFactoryC.cpp 2005-04-23 21:12:35.022166400 +0200 ++++ PolicyFactoryC.cpp 2005-04-15 13:04:39.000000000 +0200 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ + + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -26,7 +26,7 @@ + // http://www.cs.wustl.edu/~schmidt/TAO.html + + // TAO_IDL - Generated from +-// be\be_codegen.cpp:291 ++// .\be\be_codegen.cpp:291 + + + #include "PolicyFactoryC.h" +@@ -38,7 +38,7 @@ + #endif /* __BORLANDC__ */ + + // TAO_IDL - Generated from +-// be\be_visitor_arg_traits.cpp:69 ++// .\be\be_visitor_arg_traits.cpp:69 + + // Arg traits specializations. + namespace TAO +@@ -47,7 +47,7 @@ + + + // TAO_IDL - Generated from +-// be\be_visitor_interface/interface_cs.cpp:60 ++// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60 + + // Traits specializations for PortableInterceptor::PolicyFactory. + +@@ -186,3 +186,15 @@ + { + return false; + } ++ ++// Hand-crafted. ++::CORBA::Policy_ptr ++PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType ++ ACE_ENV_ARG_DECL) ++ ACE_THROW_SPEC ((CORBA::SystemException, ++ CORBA::PolicyError)) ++{ ++ ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), ++ CORBA::Policy::_nil ()); ++} ++ diff --git a/TAO/tao/diffs/PolicyFactory.diff b/TAO/tao/diffs/PolicyFactory.diff deleted file mode 100644 index 5bf52e563b9..00000000000 --- a/TAO/tao/diffs/PolicyFactory.diff +++ /dev/null @@ -1,37 +0,0 @@ ---- orig/PolicyFactoryC.h 2005-04-15 11:58:39.449555200 +0200 -+++ PolicyFactoryC.h 2005-04-15 12:22:48.683451200 +0200 -@@ -142,6 +142,16 @@ - ::CORBA::PolicyError - )) = 0; - -+ // Hand-crafted addition. -+ virtual ::CORBA::Policy_ptr _create_policy ( -+ CORBA::PolicyType type -+ ACE_ENV_ARG_DECL_WITH_DEFAULTS -+ ) -+ ACE_THROW_SPEC (( -+ CORBA::SystemException -+ , CORBA::PolicyError -+ )); -+ - // TAO_IDL - Generated from - // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210 - ---- orig/PolicyFactoryC.cpp 2005-04-15 11:58:39.489612800 +0200 -+++ PolicyFactoryC.cpp 2005-04-15 12:23:19.297472000 +0200 -@@ -186,3 +186,15 @@ - { - return false; - } -+ -+// Hand-crafted. -+::CORBA::Policy_ptr -+PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType -+ ACE_ENV_ARG_DECL) -+ ACE_THROW_SPEC ((CORBA::SystemException, -+ CORBA::PolicyError)) -+{ -+ ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE), -+ CORBA::Policy::_nil ()); -+} -+ diff --git a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc index 04f12ec1c53..e8db7ce8986 100644 --- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc +++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc @@ -1,8 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver { - requires += interceptors +project(*Server): taoserver, interceptors { Source_Files { test_i.cpp Server_ORBInitializer.cpp @@ -11,8 +10,7 @@ project(*Server): taoserver { } } -project(*Client): taoserver, taoclient { - requires += interceptors +project(*Client): taoserver, taoclient, interceptors { Source_Files { test_i.cpp testC.cpp diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h index 8ea41d53689..569419fb346 100644 --- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h +++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_CLIENT_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h index d5aef56e289..5b3c199490d 100644 --- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h +++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_SERVER_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc index d29f792f22c..c20b88c114f 100644 --- a/TAO/tests/ORT/ORT.mpc +++ b/TAO/tests/ORT/ORT.mpc @@ -1,9 +1,7 @@ // -*- MPC -*- // $Id$ -project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor { - requires += interceptors - +project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, interceptors { IDL_Files { ORT_test.idl ObjectReferenceFactory.idl @@ -23,8 +21,7 @@ project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor { } -project(Test_ORT_Client): taoclient { - requires += interceptors +project(Test_ORT_Client): taoclient, interceptors { after += Test_ORT_Server IDL_Files { diff --git a/TAO/tests/ORT/ServerORBInitializer.h b/TAO/tests/ORT/ServerORBInitializer.h index 932eabdb5df..d4736dc8efb 100644 --- a/TAO/tests/ORT/ServerORBInitializer.h +++ b/TAO/tests/ORT/ServerORBInitializer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h index 66862fa4561..41c892cfb4f 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h @@ -10,7 +10,7 @@ #define Client_ORBInitializer__h_ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" class Client_ORBInitializer diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h index 441b1649161..f02c068b74f 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h @@ -10,7 +10,7 @@ #define Server_ORBInitializer__h_ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" class Server_ORBInitializer diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h index f66e4e505c2..f26c625ffbe 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_CLIENT_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h index 3ef96adeea8..599301a17d9 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_SERVER_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h index 8ea41d53689..569419fb346 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_CLIENT_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h index d5aef56e289..5b3c199490d 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_SERVER_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h index be3545b69ac..9e1d7b79009 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_CLIENT_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp index 3e4ee86a067..7e8d6e28aa4 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp @@ -50,7 +50,6 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { -#if TAO_HAS_INTERCEPTORS == 1 PortableInterceptor::ORBInitializer_ptr temp_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -63,7 +62,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; -#endif /* TAO_HAS_INTERCEPTORS == 1 */ ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp index 3a69c959972..879b3549b22 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp @@ -3,9 +3,6 @@ // $Id$ #include "Echo_Collocated_ORBInitializer.h" - -#if TAO_HAS_INTERCEPTORS == 1 - #include "interceptors.h" #include "ace/OS_NS_string.h" @@ -70,4 +67,3 @@ Echo_Collocated_ORBInitializer::post_init ( } -#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h index baa5f1e153a..7a18eb9b37a 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h @@ -8,14 +8,11 @@ #include /**/ "ace/pre.h" #include "tao/orbconf.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if TAO_HAS_INTERCEPTORS == 1 - -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -45,8 +42,6 @@ public: #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - #include /**/ "ace/post.h" #endif /* TAO_ECHO_CLIENT_ORB_INITIALIZER_H */ diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc index 7e113c65d9e..fdc67018fb0 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc @@ -1,9 +1,8 @@ // -*- MPC -*- // $Id$ -project(*Collocated): taoserver { +project(*Collocated): taoserver, interceptors { exename = Collocated_Test - requires += interceptors Source_Files { testC.cpp testS.cpp diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h index 3e9beabf5b5..42b2ea926a4 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h @@ -4,7 +4,7 @@ #define SERVICE_CONTEXT_MANIPULATION_COLLOCATED_ORBINITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc index 7e4c72e5f1a..4b9cd5bf967 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc @@ -1,9 +1,8 @@ // -*- MPC -*- // $Id$ -project(*Collocated): taoserver { +project(*Collocated): taoserver, interceptors { exename = collocated - requires += interceptors Source_Files { testC.cpp testS.cpp diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h index 9a8cfc12dce..cd09fcce9bd 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h @@ -7,7 +7,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h index 1c6b82c715f..26b483304c7 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h @@ -7,7 +7,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h index 635a6ac9fa2..10386969df0 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h index 273bfca7145..90be3b9571a 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h index 615c249fe84..abe9074a545 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h @@ -22,6 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/PI/PI.h" #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h index 334a3cbfe65..a047658b5a8 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h index 0440e38ffa5..3470e22c973 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/IORInterceptor/IORInterceptor.h" +#include "tao/CodecFactory/CodecFactory.h" #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h index 384f57b8503..62daa94f1ae 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h index f30aa4ef1f8..1498e7c020c 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h @@ -24,7 +24,7 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h index a9105a13a63..f540262ca7b 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp index c2205ee7f2c..daa05dfb4ad 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp @@ -3,7 +3,7 @@ #include "ServerORBInitializer.h" #include "ServerRequestInterceptor.h" #include "ClientRequestInterceptor2.h" -#include "tao/ORBInitInfo.h" +#include "tao/PI/ORBInitInfo.h" #include "tao/ORB_Core.h" ACE_RCSID (PICurrent, diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h index 52d5daaa7df..9c997d45f6c 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index b4e2ab077c9..f09ea2b2b62 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -6,6 +6,7 @@ #include "ClientORBInitializer.h" #include "tao/ORBInitializer_Registry.h" +#include "tao/PICurrentC.h" ACE_RCSID (PICurrent, client, diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h index 56946bab0ed..62baa04f807 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h index 47a0b3eef41..89be36a2898 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h index 797dba654b6..9a14c62287c 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h index ba25b3e7cf0..0d011a67032 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h index 8ea41d53689..569419fb346 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_CLIENT_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h index ff825e7d172..992070c71e1 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_SERVER_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp index f686e77bbe6..8dd1103b673 100644 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp @@ -63,11 +63,11 @@ int main(int, char**) poaManager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - TestMonitorable_i* monitorable_i; + TestMonitorable_i* monitorable_i = 0; ACE_NEW_RETURN (monitorable_i, TestMonitorable_i, 1); PortableServer::ServantBase_var monitorable_var = monitorable_i; - TestMonitorable_i* m2; + TestMonitorable_i* m2 = 0; ACE_NEW_RETURN (m2, TestMonitorable_i, 1); PortableServer::ServantBase_var m2_var = m2; diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index c86f190bdb7..93234520b42 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -335,7 +335,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in ()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index 32ea7b07421..37fca92fdfa 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -367,7 +367,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in ()); + if (!check_supported_priorities (orb.in ())) + return -1; // Get the RTORB. CORBA::Object_var object = diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h index 8ea41d53689..569419fb346 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h @@ -7,7 +7,7 @@ #define TAO_CLIENT_ORB_INITIALIZER_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc index dd0a0dce389..23d288d93b3 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc +++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc @@ -7,7 +7,7 @@ project(*Server): rt_server { } } -project(*Client): rt_client { +project(*Client): rt_client, interceptors { Source_Files { testC.cpp interceptors.cpp diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index c15039ca909..f5b3ab6294c 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -216,7 +216,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 100c213843f..195747652f5 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -269,7 +269,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index 630e2607318..bce9ae91ce8 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -930,7 +930,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are // required for this test. - check_supported_priorities (orb.in ()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index 704f51513c1..3b375bfd88d 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -338,7 +338,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in ()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index b81a3dbbec2..0b8dced204b 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -304,7 +304,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in ()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index 3e18aed15f2..e884fd7068f 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -308,7 +308,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 4893b44106c..54aea3bba43 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -225,7 +225,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index bb9f688d7ca..e3df563cc73 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -158,7 +158,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // The following finds out the lowest priority for this // scheduling policy. This will give us the biggest range on NT diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index c8765bbc557..67afc2f54d9 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -925,7 +925,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp index 480ae55a041..6b9d84e58e5 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp @@ -206,6 +206,11 @@ main (int argc, char *argv[]) if (result != 0) return result; + // Make sure we can support multiple priorities that are required + // for this test. + if (!check_supported_priorities (orb.in ())) + return -1; + // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index 4be4333121b..f5611fb661b 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -338,7 +338,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp index 259168276e8..8bb768a827f 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -579,7 +579,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index e24b4ee483b..15f92c7b99a 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -409,7 +409,8 @@ main (int argc, char **argv) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 8c01de8397d..61e79637b57 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -340,7 +340,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index d6cd667cc91..5f7730781b2 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -6,7 +6,6 @@ #include "tao/ORB_Core.h" #include "ace/Task.h" #include "ace/OS_NS_unistd.h" -#include "../check_supported_priorities.cpp" ACE_RCSID(Thread_Pool, client, "$Id$") diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index ebbb52926fd..7b7f159ea56 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -347,7 +347,8 @@ main (int argc, char *argv[]) // Make sure we can support multiple priorities that are required // for this test. - check_supported_priorities (orb.in()); + if (!check_supported_priorities (orb.in ())) + return -1; // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/check_supported_priorities.cpp b/TAO/tests/RTCORBA/check_supported_priorities.cpp index 2410c64dc5b..bfbff8af5ac 100644 --- a/TAO/tests/RTCORBA/check_supported_priorities.cpp +++ b/TAO/tests/RTCORBA/check_supported_priorities.cpp @@ -25,7 +25,7 @@ sched_policy_name (int sched_policy) return name; } -void +bool check_supported_priorities (CORBA::ORB_ptr orb) { int sched_policy = @@ -46,6 +46,8 @@ check_supported_priorities (CORBA::ORB_ptr orb) "Check svc.conf options\n", sched_policy_name (sched_policy))); - ACE_OS::exit (2); + return false; } + + return true; } diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp index 44a898cb176..b80ca5720d0 100644 --- a/TAO/tests/RTCORBA/common_args.cpp +++ b/TAO/tests/RTCORBA/common_args.cpp @@ -380,8 +380,3 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes, ACE_CHECK; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Array_Base<CORBA::ULong>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Array_Base<CORBA::ULong> -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |