diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-22 10:49:31 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-22 10:49:31 +0000 |
| commit | 88ae27844cbf4c2161c86a93af209a3dfb54b092 (patch) | |
| tree | 50ce3b40ece04420b074dc4f3aa3a85a5db085b1 | |
| parent | 9e63d8770ba61597ef8f3694bec3e981c1b5b2f3 (diff) | |
| download | ATCD-88ae27844cbf4c2161c86a93af209a3dfb54b092.tar.gz | |
ChangeLogTag: Mon Aug 22 09:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
52 files changed, 275 insertions, 738 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7004bc53afa..3a71b3c0b7e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,75 @@ +Mon Aug 22 10:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/tao.mpc: + Removed a lot of files that are zapped + + * tao/ORB.cpp + * tao/ORB.h + * tao/ORB_Core.cpp + * tao/ORB_Core.h + * tao/ORB_Core.i + * tao/PI/PICurrent_Loader.h + * tao/PI_Server/PI_Server.h + * tao/PI_Server/PortableServer_ORBInitializer.cpp + * tao/PI_Server/PortableServer_ORBInitializer.h + * tao/PortableServer/PortableServer.cpp + * tao/PortableServer/PortableServer.h + * tao/PortableServer/POA_Current.{h,cpp,inl}: + * tao/PortableServer/POA_Current_Factory.{h,cpp}: + * tao/PortableServer/PS_Current.pidl + * tao/PortableServer/PS_CurrentA.cpp + * tao/PortableServer/PS_CurrentC.cpp + * tao/PortableServer/PS_CurrentC.h + Moved POACurrent back to the PortableServer libary and use an object + loader to get it on demand instead of using an orbinitializer + + + * tao/PI_Server/POA_Current.cpp + * tao/PI_Server/POA_Current.h + * tao/PI_Server/POA_Current.inl + * tao/PI_Server/PS_Current.pidl + * tao/PI_Server/PS_CurrentA.cpp + * tao/PI_Server/PS_CurrentC.cpp + * tao/PI_Server/PS_CurrentC.h + Removed, back to PortableServer + + * examples/POA/DSI/Database_i.h + * examples/POA/DSI/POA_DSI.mpc + * examples/POA/Default_Servant/File_i.cpp + * examples/POA/Default_Servant/POA_Default_Servant.mpc + * orbsvcs/ImplRepo_Service/Forwarder.cpp + * orbsvcs/ImplRepo_Service/Forwarder.h + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc + * orbsvcs/examples/ORT/Gateway_i.h + * orbsvcs/examples/ORT/ORT.mpc + * orbsvcs/orbsvcs/IFRService.mpc + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp + * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp + * orbsvcs/orbsvcs/IFRService/Repository_i.h + * orbsvcs/tests/FtRtEvent/PushConsumer.cpp + * orbsvcs/tests/FtRtEvent/PushSupplier.cpp + * orbsvcs/tests/ImplRepo/scale/scaletest.mpc + * orbsvcs/tests/ImplRepo/scale/server_i.cpp + * tests/Collocation_Opportunities/Collocation_Opportunities.cpp + * tests/Collocation_Opportunities/Collocation_Opportunities.mpc + * tests/File_IO/File_IO.mpc + * tests/File_IO/File_i.cpp + * tests/ORT/ServerORBInitializer.cpp + * tests/POA/Current/Current.cpp + * tests/POA/Current/Current.mpc + * tests/POA/Persistent_ID/Persistent_ID.mpc + * tests/POA/Persistent_ID/server.cpp + Updated, no need to use PI_Server anymore now the POACurrent is + back to the PortableServer lib. + + * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp + * orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp + * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp + Removed explicit template instantiations + + * tao/Valuetype/ValueBase.cpp + Use C++ cast instead of c-style cast + Mon Aug 22 09:09:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/AnyTypeCode/Any.h: diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h index 54e75e931f3..4c8429d98ca 100644 --- a/TAO/examples/POA/DSI/Database_i.h +++ b/TAO/examples/POA/DSI/Database_i.h @@ -7,7 +7,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/DynamicInterface/Dynamic_Implementation.h" -#include "tao/PI_Server/PI_Server.h" +#include "tao/PortableServer/PortableServer.h" #include "ace/Singleton.h" #include "ace/Malloc.h" diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc index ba33f8216d3..62a433a23c3 100644 --- a/TAO/examples/POA/DSI/POA_DSI.mpc +++ b/TAO/examples/POA/DSI/POA_DSI.mpc @@ -6,7 +6,7 @@ project(*Client) : taoclient, messaging, minimum_corba { } } -project(*Server) : taoserver, messaging, dynamicinterface, pi_server, minimum_corba { +project(*Server) : taoserver, messaging, dynamicinterface, minimum_corba { source_files { Database_i.cpp server.cpp diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp index 71efe4a6b34..d471e1b9ee7 100644 --- a/TAO/examples/POA/Default_Servant/File_i.cpp +++ b/TAO/examples/POA/Default_Servant/File_i.cpp @@ -18,7 +18,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" -#include "tao/PI_Server/PI_Server.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID(Default_Servant, File_i, "$Id$") diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc index b088140490b..897515a3602 100644 --- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc +++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc @@ -8,7 +8,7 @@ project(*Client) : taoclient, anytypecode, minimum_corba { } } -project(*Server) : taoserver, pi_server, minimum_corba { +project(*Server) : taoserver, minimum_corba { source_files { File_i.cpp server.cpp diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index 652fa297438..d254c14bb24 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -19,7 +19,6 @@ #include "tao/ORB_Constants.h" #include "tao/PortableServer/POA_Current_Impl.h" -#include "tao/PI_Server/POA_Current.h" /** * This constructor takes in orb and ImR_Locator_i pointers to store for later diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h index ddb0183e4fb..31bf107b602 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h @@ -18,8 +18,6 @@ #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/ServantLocatorC.h" -#include "tao/PI_Server/PI_Server.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index 7da850d308c..3649e86daad 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -65,7 +65,7 @@ project(ImR_Activator) : orbsvcslib, conv_lib, acexml, minimum_corba, valuetype, } } -project(ImR_Locator) : orbsvcslib, conv_lib, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml, pi_server, imr_client { +project(ImR_Locator) : orbsvcslib, conv_lib, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml, imr_client { sharedname = TAO_ImR_Locator dynamicflags = LOCATOR_BUILD_DLL after += ImR_Locator_IDL ImR_Activator_IDL diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h index 695e164312f..5207c6d76e5 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h @@ -21,7 +21,6 @@ #include "tao/PortableServer/PortableServer.h" #include "tao/DynamicInterface/Dynamic_Implementation.h" #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h" -#include "tao/PI_Server/PI_Server.h" class Gateway_i : public virtual PortableServer::DynamicImplementation diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc index fa2ed8d5e46..37769667fc4 100644 --- a/TAO/orbsvcs/examples/ORT/ORT.mpc +++ b/TAO/orbsvcs/examples/ORT/ORT.mpc @@ -1,6 +1,6 @@ // $Id$ -project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, pi_server, minimum_corba { +project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba { source_files { GatewayC.cpp GatewayS.cpp diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 1538ebd5264..78e8387fb41 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -257,8 +257,3 @@ TAO_EC_Basic_Factory::destroy_supplier_control (TAO_EC_SupplierControl* x) delete x; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp index f0240c4a97a..e393fdea4b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp @@ -37,8 +37,3 @@ TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *, { } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index 8dbc951d1b1..74adea8576b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -950,511 +950,3 @@ ACE_STATIC_SVC_DEFINE (TAO_EC_Default_Factory, 0) ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Default_Factory) -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Node<ACE_Command_Base*>; -template class ACE_Unbounded_Queue<ACE_Command_Base*>; -template class ACE_Unbounded_Queue_Iterator<ACE_Command_Base*>; -template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor*>; -template class ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor*>; -template class ACE_Node<ACE_Static_Svc_Descriptor*>; - -template class TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushConsumer>; -template class TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>; -template class TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>; -template class ACE_Unbounded_Set<TAO_EC_ProxyPushConsumer *>; -template class ACE_Node<TAO_EC_ProxyPushConsumer *>; -template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushConsumer *>; -template class ACE_RB_Tree<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base<TAO_EC_ProxyPushConsumer *, int, ACE_Less_Than<TAO_EC_ProxyPushConsumer *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Node<TAO_EC_ProxyPushConsumer *, int>; -template class ACE_Less_Than<TAO_EC_ProxyPushConsumer *>; -template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_EC_ProxyPushConsumer>; - -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator >; -template class TAO_ESF_Copy_On_Write_Collection< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator >; - -template class TAO_ESF_Proxy_Collection<TAO_EC_ProxyPushSupplier>; -template class TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>; -template class TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>; -template class ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier *>; -template class ACE_Node<TAO_EC_ProxyPushSupplier *>; -template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier *>; -template class ACE_RB_Tree<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Iterator_Base<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Reverse_Iterator<TAO_EC_ProxyPushSupplier *, int, ACE_Less_Than<TAO_EC_ProxyPushSupplier *>, ACE_Null_Mutex>; -template class ACE_RB_Tree_Node<TAO_EC_ProxyPushSupplier *, int>; -template class ACE_Less_Than<TAO_EC_ProxyPushSupplier *>; -template class TAO_ESF_Proxy_RB_Tree_Iterator<TAO_EC_ProxyPushSupplier>; - -#if defined (ACE_HAS_THREADS) -// -// To avoid duplicate instantiations of templates we must put the MT -// versions on this #ifdef, otherwise the ACE_SYNCH* macros expand to -// the ACE_NULL* versions, duplicating the non-MT versions below. -// We *cannot* use explicit ACE_Synch classes because that will not -// compile in platforms without threads. -// -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH> >; - -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH> >; - -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - TAO_SYNCH_MUTEX>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_SYNCH>; - -#endif /* ACE_HAS_THREADS */ - -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushConsumer >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; - -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH> >; -template class TAO_ESF_Immediate_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Read<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; -template class ACE_Guard< TAO_ESF_Busy_Lock_Adapter< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> > >; -template class TAO_ESF_Connected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Reconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Disconnected_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>,TAO_EC_ProxyPushSupplier >; -template class TAO_ESF_Shutdown_Command< - TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier, - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH> >; - -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Read_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_Null_Mutex>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_List_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushConsumer>, - TAO_EC_Consumer_RB_Tree_Iterator, - ACE_NULL_SYNCH>; -template class TAO_ESF_Copy_On_Write_Write_Guard< - TAO_ESF_Proxy_RB_Tree<TAO_EC_ProxyPushSupplier>, - TAO_EC_Supplier_RB_Tree_Iterator, - ACE_NULL_SYNCH>; - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -// @@ TODO!!! - -#if defined (ACE_HAS_THREADS) -#endif /* ACE_HAS_THREADS */ - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index 145521d51af..77d43f4d398 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -4,7 +4,6 @@ #include "Update_Manager.h" #include "AMI_Primary_Replication_Strategy.h" #include "../Utils/resolve_init.h" -#include "tao/PI_Server/PI_Server.h" ACE_RCSID (EventChannel, UpdateableHandler, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index c3990fd3177..85c5b6174b3 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -4,7 +4,6 @@ #include "resolve_init.h" #include "orbsvcs/FtRtecEventCommS.h" #include "tao/ORB_Core.h" -#include "tao/PI_Server/PI_Server.h" ACE_RCSID (Utils, FTEC_Gateway, diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc index d1c9375adaa..2cd7439e464 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService.mpc +++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, pi_server, minimum_corba { +project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, iortable, minimum_corba { sharedname = TAO_IFRService dynamicflags = TAO_IFRSERVICE_BUILD_DLL tagchecks += IFRService diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index 520a3e38e55..4df8834e7fb 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -35,7 +35,6 @@ #include "IFR_macro.h" #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" #include "tao/CORBA_String.h" -#include "tao/PI_Server/PI_Server.h" class IFR_Servant_Factory; diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index b91f4c5e7b6..12e291c0f78 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -3,7 +3,6 @@ #include "ace/OS_NS_sys_time.h" #include "PushConsumer.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" -#include "tao/PI_Server/PI_Server.h" #include <stdio.h> ACE_RCSID (FtRtEvent, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index db5905c7d0f..8c1b1757ecf 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -8,7 +8,6 @@ #include "tao/MProfile.h" #include "tao/Stub.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" -#include "tao/PI_Server/PI_Server.h" ACE_RCSID (FtRtEvent, PushSupplier, diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc index 9bfa04029b5..e48c599e972 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc +++ b/TAO/orbsvcs/tests/ImplRepo/scale/scaletest.mpc @@ -1,5 +1,5 @@ // $Id$ -project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, pi_server, imr_client { +project(*server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client { IDL_Files { test.idl } diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index 8b6792d7aac..21edebb203f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -3,7 +3,6 @@ #include "server_i.h" #include "tao/IORTable/IORTable.h" -#include "tao/PI_Server/PI_Server.h" #include "tao/PortableServer/Root_POA.h" #include "tao/ImR_Client/ImR_Client.h" diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 1740dc23273..3e644bc9674 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -941,18 +941,6 @@ CORBA::ORB::create_event_tc ( #endif /* TAO_HAS_MINIMUM_CORBA */ CORBA::Object_ptr -CORBA::ORB::resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL) -{ - return this->orb_core_->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); -} - -CORBA::Object_ptr -CORBA::ORB::resolve_poa_current (void) -{ - return this->orb_core_->poa_current (); -} - -CORBA::Object_ptr CORBA::ORB::resolve_policy_manager (void) { #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -1094,12 +1082,13 @@ CORBA::ORB::resolve_initial_references (const char *name, if (ACE_OS::strcmp (name, TAO_OBJID_ROOTPOA) == 0) { - result = this->resolve_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_core ()->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0) { - result = this->resolve_poa_current (); + result = this->orb_core ()->resolve_poa_current (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); } else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0) { diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 803d857d6f0..eb1d4bc509e 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -560,9 +560,6 @@ namespace CORBA CORBA::Policy_ptr _create_policy (CORBA::PolicyType type ACE_ENV_ARG_DECL); - /// Resolve the POA. - CORBA::Object_ptr resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL); - // Reference counting... CORBA::ULong _incr_refcnt (void); CORBA::ULong _decr_refcnt (void); @@ -607,9 +604,6 @@ namespace CORBA */ ~ORB (void); - /// Resolve the POA current. - CORBA::Object_ptr resolve_poa_current (void); - /// Resolve the Policy Manager for this ORB. CORBA::Object_ptr resolve_policy_manager (void); diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index e0bc632002e..ba8a3b4f6b6 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2246,6 +2246,28 @@ TAO_ORB_Core::resolve_codecfactory_i (ACE_ENV_SINGLE_ARG_DECL) } } +void +TAO_ORB_Core::resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL) +{ + TAO_Object_Loader *loader = + ACE_Dynamic_Service<TAO_Object_Loader>::instance ("TAO_POA_Current_Factory"); + if (loader == 0) + { + ACE_Service_Config::process_directive ( + ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory", + "TAO_PortableServer", + "_make_TAO_POA_Current_Factory", + "")); + loader = + ACE_Dynamic_Service<TAO_Object_Loader>::instance ("TAO_POA_Current_Factory"); + } + if (loader != 0) + { + this->poa_current_ = + loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER); + } +} + #if TAO_HAS_INTERCEPTORS == 1 void diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index a7d565fe3f7..635200f814e 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -187,7 +187,6 @@ public: /// Accessor to the POA current. //@{ CORBA::Object_ptr poa_current(void); - void poa_current (CORBA::Object_ptr poa_current); //@} /// Get the connector registry @@ -650,6 +649,9 @@ public: CORBA::Object_ptr resolve_picurrent (ACE_ENV_SINGLE_ARG_DECL); #endif /* TAO_HAS_INTERCEPTORS == 1 */ + /// Resolve POA Current. + CORBA::Object_ptr resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL); + /// Resolve the CodecFactory DLL. CORBA::Object_ptr resolve_codecfactory (ACE_ENV_SINGLE_ARG_DECL); @@ -900,6 +902,9 @@ protected: /// Obtain and cache the typecode factory object reference. void resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL); + /// Obtain and cache the poa current. + void resolve_poa_current_i (ACE_ENV_SINGLE_ARG_DECL); + #if TAO_HAS_INTERCEPTORS == 1 /// Obtain and cache the picurrent factory object reference. void resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL); @@ -1092,10 +1097,6 @@ protected: /** * POA current. - * - * @note - * This is a pointer in order to reduce the include file - * dependencies. */ CORBA::Object_var poa_current_; diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index a5dc61de082..16861381da8 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -559,19 +559,18 @@ TAO_ORB_Core::policy_current (void) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::poa_current (void) +TAO_ORB_Core::resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL) { + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, + CORBA::Object::_nil ()); + if (CORBA::is_nil (this->poa_current_.in ())) + { + this->resolve_poa_current_i (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + } return CORBA::Object::_duplicate (this->poa_current_.in ()); } -ACE_INLINE void -TAO_ORB_Core::poa_current (CORBA::Object_ptr current) -{ - ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); - this->poa_current_ = - CORBA::Object::_duplicate (current); -} - #if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO_Policy_Set * diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h index 0498d95dd5d..eb8622d0d4c 100644 --- a/TAO/tao/PI/PICurrent_Loader.h +++ b/TAO/tao/PI/PICurrent_Loader.h @@ -39,7 +39,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv [] - ACE_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Used to force the initialization of the ORB code. diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h index bbcee05ceef..e130e064684 100644 --- a/TAO/tao/PI_Server/PI_Server.h +++ b/TAO/tao/PI_Server/PI_Server.h @@ -38,7 +38,6 @@ TAO_Requires_PI_Server_Initializer = TAO_PI_Server_Init::Initializer (); #define TAO_PI_SERVER_SAFE_INCLUDE -#include "PS_CurrentC.h" #include "ServerRequestInterceptorC.h" #include "ServerRequestInfoC.h" #undef TAO_PI_SERVER_SAFE_INCLUDE diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp index 507e39545f2..8f891627c1b 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp @@ -5,7 +5,6 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/PortableServer/PortableServer.h" -#include "POA_Current.h" #include "tao/PI/ORBInitInfo.h" #include "tao/ORB_Core.h" @@ -14,13 +13,10 @@ ACE_RCSID (PI_Server, "$Id$") void -TAO_PortableServer_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) +TAO_PortableServer_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->register_poa_current (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -34,37 +30,6 @@ TAO_PortableServer_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_p } void -TAO_PortableServer_ORBInitializer::register_poa_current (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) -{ - // Narrow to a TAO_ORBInitInfo object to get access to the - // orb_core() TAO extension. - TAO_ORBInitInfo_var tao_info = - TAO_ORBInitInfo::_narrow (info - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (CORBA::is_nil (tao_info.in ())) - { - if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "(%P|%t) PortableServer_ORBInitializer::post_init:\n" - "(%P|%t) Unable to narrow " - "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" - "(%P|%t) \"TAO_ORBInitInfo *.\"\n")); - - ACE_THROW (CORBA::INTERNAL ()); - } - - // Create Current. - CORBA::Object_var current = - new TAO::Portable_Server::POA_Current; - - // Setup the POA_Current object in the ORB Core. - tao_info->orb_core ()->poa_current (current.in ()); -} - -void TAO_PortableServer_ORBInitializer::register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL) { diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h index 8ad1025aa5f..903e5adc5f9 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h @@ -54,10 +54,6 @@ private: /// Register PortableServer policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL); - - /// Register POA Current. - void register_poa_current (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); }; #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp index 0a53d6802d9..09a8f02134c 100644 --- a/TAO/tao/PI_Server/POA_Current.cpp +++ b/TAO/tao/PortableServer/POA_Current.cpp @@ -2,7 +2,7 @@ // -- PortableServer Include -- #include "POA_Current.h" -#include "tao/PortableServer/POA_Current_Impl.h" +#include "POA_Current_Impl.h" // -- TAO Include -- #include "tao/TSS_Resources.h" @@ -11,7 +11,7 @@ # include "POA_Current.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (PI_Server, +ACE_RCSID (PortableServer, POA_Current, "$Id$") diff --git a/TAO/tao/PI_Server/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h index 7cad7c5daae..a8e5583a101 100644 --- a/TAO/tao/PI_Server/POA_Current.h +++ b/TAO/tao/PortableServer/POA_Current.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "pi_server_export.h" +#include "portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "PI_Server.h" +#include "tao/PortableServer/PS_CurrentC.h" #if defined(_MSC_VER) #pragma warning(push) @@ -35,7 +35,7 @@ namespace TAO { class POA_Current_Impl; - class TAO_PI_Server_Export POA_Current + class TAO_PortableServer_Export POA_Current : public PortableServer::Current, public TAO_Local_RefCounted_Object { diff --git a/TAO/tao/PI_Server/POA_Current.inl b/TAO/tao/PortableServer/POA_Current.inl index 4c445f2d29c..4b713846977 100644 --- a/TAO/tao/PI_Server/POA_Current.inl +++ b/TAO/tao/PortableServer/POA_Current.inl @@ -2,8 +2,6 @@ // // $Id$ -#include "tao/SystemException.h" - namespace TAO { namespace Portable_Server diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp new file mode 100644 index 00000000000..b32ba5f91b0 --- /dev/null +++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp @@ -0,0 +1,32 @@ +// $Id$ + +#include "POA_Current_Factory.h" +#include "POA_Current.h" +#include "tao/ORB_Core.h" + +TAO_POA_Current_Factory::TAO_POA_Current_Factory (void) +{ +} + +CORBA::Object_ptr +TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr, + int, + ACE_TCHAR * [] + ACE_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + TAO::Portable_Server::POA_Current* adapter = 0; + ACE_NEW_RETURN (adapter, + TAO::Portable_Server::POA_Current (), + 0); + return adapter; +} + +ACE_FACTORY_DEFINE (TAO_PortableServer, TAO_POA_Current_Factory) +ACE_STATIC_SVC_DEFINE (TAO_POA_Current_Factory, + ACE_TEXT ("TAO_POA_Current_Factory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_POA_Current_Factory), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) + diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h new file mode 100644 index 00000000000..c7cbb6d2e2a --- /dev/null +++ b/TAO/tao/PortableServer/POA_Current_Factory.h @@ -0,0 +1,47 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file POA_Current_Factory.h + * + * $Id$ + * + * @author Johnny Willemsen <jwillemsen@remedy.nl> + */ +//============================================================================= + +#ifndef TAO_POA_CURRENT_FACTORY_H +#define TAO_POA_CURRENT_FACTORY_H + +#include /**/ "ace/pre.h" + +#include "portableserver_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/Object_Loader.h" +#include "ace/Service_Config.h" + +class TAO_PortableServer_Export TAO_POA_Current_Factory + : public TAO_Object_Loader +{ +public: + /// Constructor + TAO_POA_Current_Factory (void); + + /// Creates a PICurrent and returns it. + virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, + int argc, + ACE_TCHAR *argv [] + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); +}; + +ACE_STATIC_SVC_DECLARE (TAO_POA_Current_Factory) +ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_POA_Current_Factory) + +#include /**/ "ace/post.h" + +#endif /* TAO_OBJECT_ADAPTER_FACTORY_H */ diff --git a/TAO/tao/PI_Server/PS_Current.pidl b/TAO/tao/PortableServer/PS_Current.pidl index ceb6c001366..a1b7ab68b61 100644 --- a/TAO/tao/PI_Server/PS_Current.pidl +++ b/TAO/tao/PortableServer/PS_Current.pidl @@ -10,8 +10,8 @@ * * tao_idl.exe \ * -o orig -Gp -Gd -Ge 1 -Sci -Sc -GA -I$(TAO_ROOT) - * -Wb,export_macro=TAO_PI_Server_Export \ - * -Wb,export_include="pi_server_export.h" \ + * -Wb,export_macro=TAO_PortableServer_Export \ + * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ * -Wb,post_include="ace/post.h" \ * PS_Current.pidl diff --git a/TAO/tao/PI_Server/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp index 05de30be3a2..05de30be3a2 100644 --- a/TAO/tao/PI_Server/PS_CurrentA.cpp +++ b/TAO/tao/PortableServer/PS_CurrentA.cpp diff --git a/TAO/tao/PI_Server/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp index 92de45c9df6..92de45c9df6 100644 --- a/TAO/tao/PI_Server/PS_CurrentC.cpp +++ b/TAO/tao/PortableServer/PS_CurrentC.cpp diff --git a/TAO/tao/PI_Server/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h index 468ba6b69bf..69ac3faaf4d 100644 --- a/TAO/tao/PI_Server/PS_CurrentC.h +++ b/TAO/tao/PortableServer/PS_CurrentC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI_Server/pi_server_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -53,7 +53,7 @@ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -#define TAO_EXPORT_MACRO TAO_PI_Server_Export +#define TAO_EXPORT_MACRO TAO_PortableServer_Export #if defined(_MSC_VER) #pragma warning(push) @@ -69,22 +69,22 @@ namespace PortableServer { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLESERVER_CURRENT__VAR_OUT_CH_) #define _PORTABLESERVER_CURRENT__VAR_OUT_CH_ - + class Current; typedef Current *Current_ptr; - + typedef TAO_Objref_Var_T< Current > Current_var; - + typedef TAO_Objref_Out_T< Current @@ -92,65 +92,65 @@ namespace PortableServer Current_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLESERVER_CURRENT_CH_) #define _PORTABLESERVER_CURRENT_CH_ - - class TAO_PI_Server_Export Current + + class TAO_PortableServer_Export Current : public virtual ::CORBA::Current { public: typedef Current_ptr _ptr_type; typedef Current_var _var_type; - + // The static operations. static Current_ptr _duplicate (Current_ptr obj); - + static void _tao_release (Current_ptr obj); - + static Current_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _nil (void) { return static_cast<Current_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:53 #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_) #define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_ - - class TAO_PI_Server_Export NoContext : public CORBA::UserException + + class TAO_PortableServer_Export NoContext : public CORBA::UserException { public: - + NoContext (void); NoContext (const NoContext &); ~NoContext (void); NoContext &operator= (const NoContext &); - + static void _tao_any_destructor (void *); - + static NoContext *_downcast (CORBA::Exception *); static const NoContext *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -159,28 +159,28 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:129 - + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + static ::CORBA::TypeCode_ptr const _tc_NoContext; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::POA_ptr get_POA ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) @@ -188,10 +188,10 @@ namespace PortableServer CORBA::SystemException, ::PortableServer::Current::NoContext )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::ObjectId * get_object_id ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) @@ -199,10 +199,10 @@ namespace PortableServer CORBA::SystemException, ::PortableServer::Current::NoContext )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::PortableServer::Servant get_servant ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) @@ -210,37 +210,37 @@ namespace PortableServer CORBA::SystemException, ::PortableServer::Current::NoContext )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Current (void); - + virtual ~Current (void); - + private: // Private and unimplemented for concrete interfaces. Current (const Current &); - + void operator= (const Current &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - - extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_Current; + + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_Current; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -256,9 +256,9 @@ namespace TAO #if !defined (_PORTABLESERVER_CURRENT__TRAITS_CH_) #define _PORTABLESERVER_CURRENT__TRAITS_CH_ - + template<> - struct TAO_PI_Server_Export Objref_Traits< ::PortableServer::Current> + struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::Current> { static ::PortableServer::Current_ptr duplicate ( ::PortableServer::Current_ptr @@ -279,17 +279,17 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_interface/any_op_ch.cpp:52 -TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr); // copying -TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr *); // non-copying -TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current_ptr &); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr); // copying +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr *); // non-copying +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current_ptr &); // TAO_IDL - Generated from // be\be_visitor_exception/any_op_ch.cpp:52 -TAO_PI_Server_Export void operator<<= (CORBA::Any &, const PortableServer::Current::NoContext &); // copying version -TAO_PI_Server_Export void operator<<= (CORBA::Any &, PortableServer::Current::NoContext*); // noncopying version -TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current::NoContext *&); // deprecated -TAO_PI_Server_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&); +TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::Current::NoContext &); // copying version +TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current::NoContext*); // noncopying version +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current::NoContext *&); // deprecated +TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&); // TAO_IDL - Generated from // be\be_codegen.cpp:955 diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp index 22d7b1879a8..2517081b640 100644 --- a/TAO/tao/PortableServer/PortableServer.cpp +++ b/TAO/tao/PortableServer/PortableServer.cpp @@ -2,6 +2,7 @@ #include "PortableServer.h" #include "Object_Adapter.h" #include "Object_Adapter_Factory.h" +#include "POA_Current_Factory.h" #include "ThreadStrategyFactoryImpl.h" #include "LifespanStrategyFactoryImpl.h" @@ -160,6 +161,10 @@ TAO_POA_Initializer::init (void) ); #endif /* TAO_HAS_MINIMUM_POA == 0 */ + ACE_Service_Config::process_directive ( + ace_svc_desc_TAO_POA_Current_Factory + ); + return ACE_Service_Config::process_directive ( ace_svc_desc_TAO_Object_Adapter_Factory diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h index 22bbb1dece3..53681e20560 100644 --- a/TAO/tao/PortableServer/PortableServer.h +++ b/TAO/tao/PortableServer/PortableServer.h @@ -35,6 +35,7 @@ TAO_Requires_POA_Initializer = TAO_POA_Initializer::init (); #include "PortableServerC.h" #undef TAO_PORTABLESERVER_SAFE_INCLUDE #include "POAManagerC.h" +#include "PS_CurrentC.h" #include "PortableServer_Functions.h" #include "PortableServer_WFunctions.h" #include "PS_ForwardA.h" diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index 3c2e8e8a7aa..fdb5ba89524 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -572,7 +572,7 @@ operator<< (TAO_OutputCDR &strm, return CORBA::ValueBase::_tao_marshal ( strm, const_cast<CORBA::ValueBase *> (_tao_valuetype), - (ptrdiff_t) &CORBA::ValueBase::_downcast + reinterpret_cast<ptrdiff_t> (&CORBA::ValueBase::_downcast) ); } diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 937f4be87fe..53d846663db 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -234,22 +234,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { Adapter_Factory.h Adapter.h Adapter_Registry.h - Alias_TypeCode.h - Alias_TypeCode_Static.h Allocator.h - Any_Arg_Traits.h - Any_Array_Impl_T.h - Any_Basic_Impl.h - Any_Basic_Impl_T.h - Any_Dual_Impl_T.h - Any.h - Any_Impl.h - Any_Impl_T.h - AnySeqC.h - AnySeqS.h - Any_Special_Impl_T.h - Any_SystemException.h - Any_Unknown_IDL_Type.h Arg_Traits_T.h Argument.h Array_VarOut_T.h @@ -323,8 +308,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { Dynamic_ParameterC.h Endpoint.h Endpoint_Selector_Factory.h - Enum_TypeCode.h - Enum_TypeCode_Static.h Environment.h Exception_Data.h Exception.h @@ -333,7 +316,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { FILE_Parser.h Fixed_Array_Argument_T.h Fixed_Size_Argument_T.h - Fixed_TypeCode.h FloatSeqC.h FloatSeqS.h Flushing_Strategy.h @@ -404,7 +386,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { MProfile.h Muxed_TMS.h New_Leader_Generator.h - Null_RefCount_Policy.h Object_Argument_T.h Object.h objectid.h @@ -415,8 +396,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { Object_Proxy_Broker.h Object_Ref_Table.h Object_T.h - Objref_TypeCode.h - Objref_TypeCode_Static.h Objref_VarOut_T.h OctetSeqC.h OctetSeqS.h @@ -461,7 +440,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { Queued_Message.h Reactive_Connect_Strategy.h Reactive_Flushing_Strategy.h - Recursive_Type_TypeCode.h RefCount_Policy_Traits.h Refcounted_ObjectKey.h Remote_Invocation.h @@ -488,11 +466,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { Special_Basic_Argument_T.h StringSeqC.h StringSeqS.h - String_TypeCode.h - String_TypeCode_Static.h - String_TypeCode_Traits.h - Struct_TypeCode.h - Struct_TypeCode_Static.h Stub_Factory.h Stub.h Synch_Invocation.h @@ -524,16 +497,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { Transport.h Transport_Mux_Strategy.h Transport_Timer.h - True_RefCount_Policy.h TSS_Resources.h - TypeCode_CDR_Extraction.h - TypeCode_Constants.h - TypeCode_Case.h - TypeCode_Case_T.h - TypeCode_Struct_Field.h - TypeCode_Traits.h - TypeCode_Value_Field.h - TypeCode.h TypeCodeFactory_Adapter.h Typecode_typesC.h Typecode_typesS.h @@ -543,13 +507,9 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { ULongLongSeqS.h ULongSeqC.h ULongSeqS.h - Union_TypeCode.h - Union_TypeCode_Static.h UserException.h UShortSeqC.h UShortSeqS.h - Value_TypeCode.h - Value_TypeCode_Static.h Valuetype_Adapter.h Var_Array_Argument_T.h varbase.h @@ -576,22 +536,9 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core { Template_Files { *_T.cpp Acceptor_Impl.cpp - Alias_TypeCode.cpp Condition.cpp Connector_Impl.cpp - Enum_TypeCode.cpp - Fixed_TypeCode.cpp - Objref_TypeCode.cpp - Recursive_Type_TypeCode.cpp - Sequence_TypeCode.cpp - String_TypeCode.cpp - Struct_TypeCode.cpp TAO_Singleton.cpp - TypeCode_Base_Attributes.cpp - TypeCode_Case.cpp - TypeCode_Case_T.cpp - Union_TypeCode.cpp - Value_TypeCode.cpp orb.idl } diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index 592cd575f09..28aa663f7aa 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -3,8 +3,7 @@ #include "testS.h" #include "ace/Task.h" #include "tao/PortableServer/Object_Adapter.h" -#include "tao/PI_Server/PI_Server.h" -#include "tao/PI_Server/POA_Current.h" +#include "tao/PortableServer/POA_Current.h" #include "tao/PortableServer/POA_Current_Impl.h" ACE_RCSID(Collocation_Opportunities, Collocation_Opportunities, "$Id$") diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc index 97060558b60..6abbe5ef004 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(Collocation Opportunities): taoserver, pi_server { +project(Collocation Opportunities): taoserver { exename = Collocation_Opportunities } diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc index 615787310c6..7d29aa811f5 100644 --- a/TAO/tests/File_IO/File_IO.mpc +++ b/TAO/tests/File_IO/File_IO.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Server): taoserver, pi_server, minimum_corba { +project(*Server): taoserver, minimum_corba { Source_Files { File_i.cpp server.cpp diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp index 43d517304b2..fd9c97a8d60 100644 --- a/TAO/tests/File_IO/File_i.cpp +++ b/TAO/tests/File_IO/File_i.cpp @@ -18,7 +18,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" -#include "tao/PI_Server/PI_Server.h" ACE_RCSID(Default_Servant, File_i, "File_i.cpp,v 1.14 2001/03/04 19:27:53 irfan Exp") diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp index 1058b2bd9ad..40853060d7b 100644 --- a/TAO/tests/ORT/ServerORBInitializer.cpp +++ b/TAO/tests/ORT/ServerORBInitializer.cpp @@ -3,6 +3,7 @@ #include "ORT_test_IORInterceptor.h" #include "tao/ORB_Constants.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID (ORT, diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp index 781f03e9e22..cfb3e541f38 100644 --- a/TAO/tests/POA/Current/Current.cpp +++ b/TAO/tests/POA/Current/Current.cpp @@ -19,7 +19,6 @@ #include "tao/ORB.h" #include "tao/PortableServer/PortableServer.h" -#include "tao/PI_Server/PI_Server.h" #include "ace/Log_Msg.h" diff --git a/TAO/tests/POA/Current/Current.mpc b/TAO/tests/POA/Current/Current.mpc index d08e1edbd9d..d2819003e8f 100644 --- a/TAO/tests/POA/Current/Current.mpc +++ b/TAO/tests/POA/Current/Current.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project(POA*): taoserver, pi_server { +project(POA*): taoserver { exename = Current } diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc index decda43041e..735ef5e6ed2 100644 --- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc +++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(POA_server*): taoserver, pi_server { +project(POA_server*): taoserver { Source_Files { server.cpp } diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index b7fdd45d0e4..8ae27f21412 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -20,7 +20,7 @@ #include "ace/SString.h" #include "testS.h" #include "ace/OS_NS_stdio.h" -#include "tao/PI_Server/PI_Server.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID(Explicit_Activation, server, "$Id$") |