diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-22 19:44:01 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-08-22 19:44:01 +0000 |
| commit | 7b382ee202d79eade356cf4bf5929e2014172dcc (patch) | |
| tree | 8f2110046254d7c908e4dbc4cad9bd9b4741f1a0 | |
| parent | 182487a3fb59ea7e230679b6ddf234e3b8d63902 (diff) | |
| download | ATCD-7b382ee202d79eade356cf4bf5929e2014172dcc.tar.gz | |
Removed POA_Extension_Initializer and made several small fixes
34 files changed, 293 insertions, 1416 deletions
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 15994b0d674..9939a5c1742 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -272,7 +272,6 @@ ORB_CORE_FILES = \ LRU_Connection_Purging_Strategy \ Policy_Set \ Default_Endpoint_Selector_Factory \ - POA_Extension_Initializer \ Thread_Lane_Resources \ Thread_Lane_Resources_Manager \ Default_Thread_Lane_Resources_Manager \ @@ -15946,7 +15945,7 @@ realclean: Default_Protocols_Hooks.h \ Default_Protocols_Hooks.i \ IORInfo.h LocalObject.h Flushing_Strategy.h \ - POA_Extension_Initializer.h Buffering_Constraint_Policy.h \ + Buffering_Constraint_Policy.h \ Buffering_Constraint_Policy.i \ LF_Event_Loop_Thread_Helper.h \ LF_Strategy.h \ @@ -30652,111 +30651,6 @@ realclean: Invocation_Endpoint_Selectors.i \ Invocation.i -.obj/POA_Extension_Initializer.o .obj/POA_Extension_Initializer.so .shobj/POA_Extension_Initializer.o .shobj/POA_Extension_Initializer.so: POA_Extension_Initializer.cpp \ - POA_Extension_Initializer.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - try_macros.h \ - orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - varbase.h \ - TAO_Export.h \ - corbafwd.i \ - Environment.h \ - corbafwd.h \ - Environment.i - .obj/Thread_Lane_Resources.o .obj/Thread_Lane_Resources.so .shobj/Thread_Lane_Resources.o .shobj/Thread_Lane_Resources.so: Thread_Lane_Resources.cpp \ Thread_Lane_Resources.h \ $(ACE_ROOT)/ace/pre.h \ diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor index ae2cb7d53da..960ee7bbed2 100644 --- a/TAO/tao/Makefile.bor +++ b/TAO/tao/Makefile.bor @@ -135,7 +135,6 @@ OBJFILES = \ $(OBJDIR)\Object_Proxy_Impl.obj \ $(OBJDIR)\Object_Ref_Table.obj \ $(OBJDIR)\OctetSeqC.obj \ - $(OBJDIR)\POA_Extension_Initializer.obj \ $(OBJDIR)\Parser_Registry.obj \ $(OBJDIR)\Pluggable.obj \ $(OBJDIR)\Pluggable_Messaging.obj \ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 90da23b525d..4c2d0103579 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -35,8 +35,6 @@ #include "Flushing_Strategy.h" -#include "POA_Extension_Initializer.h" - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) # include "Buffering_Constraint_Policy.h" #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ @@ -93,8 +91,7 @@ const char * TAO_ORB_Core::poa_factory_directive_ = "dynamic TAO_POA Service_Object * TAO_PortableServer:_make_TAO_Object_Adapter_Factory()"; TAO_ORB_Core::TAO_ORB_Core (const char *orbid) - : poa_extension_initializer_ (0), - protocols_hooks_ (0), + : protocols_hooks_ (0), lock_ (), connector_registry_ (0), thread_lane_resources_manager_ (0), @@ -116,17 +113,8 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) message_block_dblock_allocator_ (0), message_block_buffer_allocator_ (0), message_block_msgblock_allocator_ (0), - resource_factory_from_service_config_ (0), - // @@ This is not needed since the default resource factory, fredk - // is statically added to the service configurator. client_factory_ (0), - client_factory_from_service_config_ (0), - // @@ This is not needed since the default client factory, fredk - // is statically added to the service configurator. server_factory_ (0), - server_factory_from_service_config_ (0), - // @@ This is not needed since the default server factory, fredk - // is statically added to the service configurator. opt_for_collocation_ (1), use_global_collocation_ (1), collocation_strategy_ (THRU_POA), @@ -239,8 +227,6 @@ TAO_ORB_Core::~TAO_ORB_Core (void) delete this->transport_sync_strategy_; - delete this->poa_extension_initializer_; - delete this->corba_priority_normalizer_; } @@ -1145,21 +1131,6 @@ TAO_ORB_Core::fini (void) this->message_block_msgblock_allocator_->remove (); delete this->message_block_msgblock_allocator_; - // @@ This is not needed since the default resource factory - // is statically added to the service configurator, fredk - if (!this->resource_factory_from_service_config_) - delete resource_factory_; - - // @@ This is not needed since the default client factory - // is statically added to the service configurator, fredk - if (!this->client_factory_from_service_config_) - delete client_factory_; - - // @@ This is not needed since the default server factory - // is statically added to the service configurator, fredk - if (!this->server_factory_from_service_config_) - delete server_factory_; - delete this; return 0; @@ -1248,43 +1219,14 @@ TAO_ORB_Core::typecodefactory_adapter_name (void) TAO_Resource_Factory * TAO_ORB_Core::resource_factory (void) { - if (this->resource_factory_ == 0) - { - // Look in the service repository for an instance. - this->resource_factory_ = - ACE_Dynamic_Service<TAO_Resource_Factory>::instance - (TAO_ORB_Core::resource_factory_name_); - // @@ Not needed! - this->resource_factory_from_service_config_ = 1; - } + // Check if there is a cached reference. + if (this->resource_factory_ != 0) + return this->resource_factory_; - //@@ None of this stuff is needed since the default resource factory - // is statically adde to the Service Configurator! - if (this->resource_factory_ == 0) - { - // Still don't have one, so let's allocate the default. This - // will throw an exception if it fails on exception-throwing - // platforms. - if (TAO_debug_level > 0) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("(%P|%t) WARNING - No Resource Factory found ") - ACE_TEXT ("in Service Repository.\n") - ACE_TEXT (" Using default instance with GLOBAL resource ") - ACE_TEXT ("source specifier.\n"))); - - TAO_Default_Resource_Factory *default_factory; - ACE_NEW_RETURN (default_factory, - TAO_Default_Resource_Factory, - 0); - - // @@ Not needed. - this->resource_factory_from_service_config_ = 0; - this->resource_factory_ = default_factory; - - // @@ At this point we need to register this with the - // Service_Repository in order to get it cleaned up properly. - // But, for now we let it leak. - } + // Look in the service repository for an instance. + this->resource_factory_ = + ACE_Dynamic_Service<TAO_Resource_Factory>::instance + (TAO_ORB_Core::resource_factory_name_); return this->resource_factory_; } @@ -1319,38 +1261,12 @@ TAO_ORB_Core::stub_factory (void) ACE_Dynamic_Service<TAO_Stub_Factory>::instance (TAO_ORB_Core::stub_factory_name_); - // If there still isn't a reference, allocate the default. - if (this->stub_factory_ == 0) - { - if (TAO_debug_level > 0) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("(%P|%t) WARNING - No Stub Factory found ") - ACE_TEXT ("in Service Repository.\n") - ACE_TEXT (" Using default instance with GLOBAL resource ") - ACE_TEXT ("source specifier.\n"))); - - // @@ RTCORBA Subsetting: The following comment probably should say - // this if this doesn't work, a segmentation fault will be quickly - // generated... - - // This will throw an exception if it fails on exception-throwing - // platforms. - TAO_Stub_Factory *stub_factory; - ACE_NEW_RETURN (stub_factory, - TAO_Default_Stub_Factory, - 0); - - // Store a copy for later use. - this->stub_factory_ = stub_factory; - } - return this->stub_factory_; } void -TAO_ORB_Core::set_poa_factory ( - const char *poa_factory_name, - const char *poa_factory_directive) +TAO_ORB_Core::set_poa_factory (const char *poa_factory_name, + const char *poa_factory_directive) { TAO_ORB_Core::poa_factory_name_ = poa_factory_name; TAO_ORB_Core::poa_factory_directive_ = poa_factory_directive; @@ -1358,8 +1274,7 @@ TAO_ORB_Core::set_poa_factory ( void -TAO_ORB_Core::set_endpoint_selector_factory ( - const char *endpoint_selector_factory_name) +TAO_ORB_Core::set_endpoint_selector_factory (const char *endpoint_selector_factory_name) { TAO_ORB_Core::endpoint_selector_factory_name_ = endpoint_selector_factory_name; @@ -1377,31 +1292,6 @@ TAO_ORB_Core::endpoint_selector_factory (void) ACE_Dynamic_Service<TAO_Endpoint_Selector_Factory>::instance (TAO_ORB_Core::endpoint_selector_factory_name_); - // If there still isn't a reference, allocate the default. - if (this->endpoint_selector_factory_ == 0) - { - if (TAO_debug_level > 0) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("(%P|%t) WARNING - No Endpoint Selector Factory found ") - ACE_TEXT ("in Service Repository.\n") - ACE_TEXT (" Using default instance with GLOBAL resource ") - ACE_TEXT ("source specifier.\n"))); - - // @@ RTCORBA Subsetting: The following comment probably should say - // this if this doesn't work, a segmentation fault will be quickly - // generated... - - // This will throw an exception if it fails on exception-throwing - // platforms. - TAO_Endpoint_Selector_Factory *selector_factory; - ACE_NEW_RETURN (selector_factory, - TAO_Default_Endpoint_Selector_Factory, - 0); - - // Store a copy for later use. - this->endpoint_selector_factory_ = selector_factory; - } - return this->endpoint_selector_factory_; } @@ -1423,28 +1313,6 @@ TAO_ORB_Core::get_protocols_hooks (CORBA::Environment &ACE_TRY_ENV) ACE_Dynamic_Service<TAO_Protocols_Hooks>::instance (TAO_ORB_Core::protocols_hooks_name_); - //@@ None of this stuff is needed since the default client factory - // is statically added to the Service Configurator, fredk - // If there still isn't a reference, allocate the default. - if (this->protocols_hooks_ == 0) - { - if (TAO_debug_level > 0) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("(%P|%t) WARNING - No Protocols Hooks found ") - ACE_TEXT ("in Service Repository.\n") - ACE_TEXT (" Using default instance with GLOBAL resource ") - ACE_TEXT ("source specifier.\n"))); - - TAO_Protocols_Hooks *protocols_hooks; - ACE_NEW_THROW_EX (protocols_hooks, - TAO_Default_Protocols_Hooks, - CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); - - // Store a copy for later use. - this->protocols_hooks_ = protocols_hooks; - } - // Initialize the protocols hooks instance. this->protocols_hooks_->init_hooks (this, ACE_TRY_ENV); @@ -1458,14 +1326,14 @@ TAO_ORB_Core::bidirectional_giop_init (CORBA::Environment &ACE_TRY_ENV) if (this->bidir_adapter_ == 0) { this->bidir_adapter_ = - ACE_Dynamic_Service<TAO_BiDir_Adapter>::instance ("BiDirGIOP_Loader"); + ACE_Dynamic_Service<TAO_BiDir_Adapter>::instance ("BiDirGIOP_Loader"); } if (this->bidir_adapter_) - return this->bidir_adapter_->activate (this->orb_.in (), - 0, - 0, - ACE_TRY_ENV); + return this->bidir_adapter_->activate (this->orb_.in (), + 0, + 0, + ACE_TRY_ENV); else return 0; } @@ -1576,34 +1444,9 @@ TAO_ORB_Core::client_factory (void) { // Look in the service repository for an instance. this->client_factory_ = - ACE_Dynamic_Service<TAO_Client_Strategy_Factory>::instance ( - "Client_Strategy_Factory"); - // @@ Not needed! - this->client_factory_from_service_config_ = 1; + ACE_Dynamic_Service<TAO_Client_Strategy_Factory>::instance ("Client_Strategy_Factory"); } - //@@ None of this stuff is needed since the default client factory - // is statically added to the Service Configurator, fredk - if (this->client_factory_ == 0) - { - // Still don't have one, so let's allocate the default. This - // will throw an exception if it fails on exception-throwing - // platforms. - if (TAO_debug_level > 0) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("(%P|%t) WARNING - No Client Strategy Factory found ") - ACE_TEXT ("in Service Repository.\n") - ACE_TEXT (" Using default instance.\n"))); - - ACE_NEW_RETURN (this->client_factory_, - TAO_Default_Client_Strategy_Factory, - 0); - - this->client_factory_from_service_config_ = 0; - // At this point we need to register this with the - // Service_Repository in order to get it cleaned up properly. - // But, for now we let it leak. - } return this->client_factory_; } @@ -1614,35 +1457,7 @@ TAO_ORB_Core::server_factory (void) { // Look in the service repository for an instance. this->server_factory_ = - ACE_Dynamic_Service<TAO_Server_Strategy_Factory>::instance ( - "Server_Strategy_Factory"); - // @@ Not needed! - this->server_factory_from_service_config_ = 1; - } - - //@@ None of this stuff is needed since the default server factory - // is statically added to the Service Configurator, fredk - - // If the <server_factory_> isn't found it's usually because the ORB - // hasn't been intialized correctly... - if (this->server_factory_ == 0) - { - // Still don't have one, so let's allocate the default. - if (TAO_debug_level > 0) - ACE_ERROR ((LM_WARNING, - ACE_TEXT ("(%P|%t) WARNING - No %s found in Service Repository.") - ACE_TEXT (" Using default instance.\n"), - ACE_TEXT ("Server Strategy Factory"))); - - ACE_NEW_RETURN (this->server_factory_, - TAO_Default_Server_Strategy_Factory, - 0); - - // @@ Not needed! - this->server_factory_from_service_config_ = 0; - // At this point we need to register this with the - // <Service_Repository> to get it cleaned up properly. But, for - // now we let it leak. + ACE_Dynamic_Service<TAO_Server_Strategy_Factory>::instance ("Server_Strategy_Factory"); } return this->server_factory_; @@ -2909,16 +2724,6 @@ TAO_ORB_Core::get_cached_policy (TAO_Cached_Policy_Type type) #endif /* (TAO_HAS_CORBA_MESSAGING == 1) */ -void -TAO_ORB_Core::add_poa_extension_initializer (TAO_POA_Extension_Initializer *initializer) -{ - if (this->poa_extension_initializer_) - this->poa_extension_initializer_->add_initializer (initializer); - else - this->poa_extension_initializer_ = initializer; -} - - // **************************************************************** TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void) diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index f2a8f899961..1cde2721d19 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -90,8 +90,6 @@ class TAO_Delayed_Buffering_Sync_Strategy; class TAO_Transport_Sync_Strategy; class TAO_Sync_Strategy; -class TAO_POA_Extension_Initializer; - // **************************************************************** /** @@ -258,13 +256,6 @@ public: /// Get the adapter registry TAO_Adapter_Registry *adapter_registry (void); - /// Add a POA extension initializer. The ORB Core takes ownership of - /// the passed in instance. - void add_poa_extension_initializer (TAO_POA_Extension_Initializer *initializer); - - /// Get the POA extension initializers. - TAO_POA_Extension_Initializer *poa_extension_initializer (void); - /// Get the priority normalizer. TAO_CORBA_Priority_Normalizer *corba_priority_normalizer (void) const; @@ -601,9 +592,6 @@ public: /// This strategy will sync with the transport. TAO_Transport_Sync_Strategy &transport_sync_strategy (void); - /// Pointer to chain of POA extension initializers. - TAO_POA_Extension_Initializer *poa_extension_initializer_; - /// Handle to the factory for protocols_hooks_.. TAO_Protocols_Hooks *protocols_hooks_; @@ -1086,30 +1074,12 @@ protected: // poa_factory_name_ dynamically. static const char *poa_factory_directive_; - // @@ This is not needed since the default resource factory - // is staticaly added to the service configurator. - /// TRUE if <resource_factory_> was obtained from the Service - /// Configurator. - CORBA::Boolean resource_factory_from_service_config_; - /// Handle to the factory for Client-side strategies. TAO_Client_Strategy_Factory *client_factory_; - // @@ This is not needed since the client facotry factory - // is staticaly added to the service configurator. - /// TRUE if <client_factory_> was obtained from the Service - /// Configurator. - CORBA::Boolean client_factory_from_service_config_; - /// Handle to the factory for Server-side strategies. TAO_Server_Strategy_Factory *server_factory_; - // @@ This is not needed since the server factory factory - // is staticaly added to the service configurator. - /// TRUE if <server_factory_> was obtained from the Service - /// Configurator. - CORBA::Boolean server_factory_from_service_config_; - /** * @name Service Level Hooks */ diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 11004a1af29..d78bfc23eb1 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -55,12 +55,6 @@ TAO_ORB_Core::flushing_strategy (void) return this->flushing_strategy_; } -ACE_INLINE TAO_POA_Extension_Initializer * -TAO_ORB_Core::poa_extension_initializer (void) -{ - return this->poa_extension_initializer_; -} - ACE_INLINE CORBA::Boolean TAO_ORB_Core::service_profile_selection (TAO_MProfile &mprofile, TAO_Profile *&profile) diff --git a/TAO/tao/POA_Extension_Initializer.cpp b/TAO/tao/POA_Extension_Initializer.cpp deleted file mode 100644 index fcfc5440c8d..00000000000 --- a/TAO/tao/POA_Extension_Initializer.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// $Id$ - -#include "POA_Extension_Initializer.h" -#include "Environment.h" - -ACE_RCSID(tao, TAO_POA_Extension_Initializer, "$Id$") - -TAO_POA_Extension_Initializer::TAO_POA_Extension_Initializer (void) - : next_ (0) -{ - // No-Op. -} - -TAO_POA_Extension_Initializer::~TAO_POA_Extension_Initializer (void) -{ - delete this->next_; -} - -void -TAO_POA_Extension_Initializer::add_initializer (TAO_POA_Extension_Initializer *initializer) -{ - if (this->next_ == 0) - this->next_ = initializer; - else - { - initializer->next_ = this->next_; - this->next_ = initializer; - } -} - -void -TAO_POA_Extension_Initializer::register_hooks (TAO_Object_Adapter &object_adapter, - CORBA::Environment &ACE_TRY_ENV) -{ - this->register_hooks_impl (object_adapter, ACE_TRY_ENV); - ACE_CHECK; - - if (this->next_ != 0) - { - this->next_->register_hooks (object_adapter, ACE_TRY_ENV); - ACE_CHECK; - } -} - diff --git a/TAO/tao/POA_Extension_Initializer.h b/TAO/tao/POA_Extension_Initializer.h deleted file mode 100644 index ee926c917c0..00000000000 --- a/TAO/tao/POA_Extension_Initializer.h +++ /dev/null @@ -1,60 +0,0 @@ -// -*- C++ -*- - -// =================================================================== -/** - * @file POA_Extension_Initializer.h - * - * $Id$ - * - * @author Frank Hunleth <fhunleth@cs.wustl.edu> - * @author Angelo Corsaro <corsaro@cs.wustl.edu> - */ -// =================================================================== - -#ifndef TAO_POA_EXTENSION_INITIALIZER_H -#define TAO_POA_EXTENSION_INITIALIZER_H -#include "ace/pre.h" - -#include "corbafwd.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Forward reference. -class TAO_Object_Adapter; - -class TAO_Export TAO_POA_Extension_Initializer -{ -public: - /// Constructor. - TAO_POA_Extension_Initializer (void); - - /// Destructor. - virtual ~TAO_POA_Extension_Initializer (void); - - /** - * Called at POA initialization for libraries to register their - * POA extensions with the POA. - */ - void register_hooks (TAO_Object_Adapter &object_adapter, - CORBA::Environment &ACE_TRY_ENV); - - /** - * Adds an initializer to the "chain of initializers". This is used - * to reduce the footprint of the ORB core that would have been needed - * to store a variable length list of POA extension initializers. - */ - void add_initializer (TAO_POA_Extension_Initializer *initializer); - -protected: - - virtual void register_hooks_impl (TAO_Object_Adapter &object_adapter, - CORBA::Environment &ACE_TRY_ENV) = 0; - -private: - TAO_POA_Extension_Initializer *next_; -}; - -#include "ace/post.h" -#endif /* TAO_POA_EXTENSION_INITIALIZER_H */ diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index 89db9a94ffc..59022744038 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -1317,7 +1317,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/POA_Extension_Initializer.h \ $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \ $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \ $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 5748bde7b6e..f62be74a285 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -20,7 +20,6 @@ #include "tao/MProfile.h" #include "tao/debug.h" #include "tao/PortableInterceptor.h" -#include "tao/POA_Extension_Initializer.h" #include "tao/Thread_Lane_Resources_Manager.h" #include "tao/Thread_Lane_Resources.h" @@ -556,15 +555,6 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_ENV); ACE_CHECK; - // Call the POA Extension initializers so that they can register their hooks. - TAO_POA_Extension_Initializer *extensions = - this->orb_core_.poa_extension_initializer (); - if (extensions != 0) - { - extensions->register_hooks (*this, ACE_TRY_ENV); - ACE_CHECK; - } - // If a POA extension hasn't changed the servant dispatcher, initialize the // default one. if (this->servant_dispatcher_ == 0) diff --git a/TAO/tao/RTCORBA/Makefile b/TAO/tao/RTCORBA/Makefile index 381d5a7aaa8..00bb6394df0 100644 --- a/TAO/tao/RTCORBA/Makefile +++ b/TAO/tao/RTCORBA/Makefile @@ -647,6 +647,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ $(TAO_ROOT)/tao/Thread_Lane_Resources.i \ Thread_Pool.h \ + RTCORBAC.h \ + RTCORBAC.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -678,9 +680,6 @@ endif # corba_messaging $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - RTCORBA.h \ - RTCORBAC.h \ - RTCORBAC.i \ Thread_Pool.i \ $(TAO_ROOT)/tao/Leader_Follower.h \ $(TAO_ROOT)/tao/LF_Follower.h \ @@ -1279,13 +1278,7 @@ endif # corba_messaging $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - RT_Protocols_Hooks.h \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - Priority_Mapping_Manager.h Priority_Mapping.h Priority_Mapping.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - Priority_Mapping_Manager.i RT_Protocols_Hooks.i + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h .obj/RTCORBAC.o .obj/RTCORBAC.so .shobj/RTCORBAC.o .shobj/RTCORBAC.so: RTCORBAC.cpp RTCORBAC.h \ $(ACE_ROOT)/ace/pre.h \ @@ -1601,7 +1594,11 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - RTCORBA.h rtcorba_export.h \ + RTCORBAC.h rtcorba_export.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -1671,12 +1668,7 @@ endif # corba_messaging $(TAO_ROOT)/tao/try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ @@ -2672,7 +2664,7 @@ endif # corba_messaging $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation.i \ - RT_Policy_i.h RTCORBA.h RTCORBAC.h RTCORBAC.i RT_Policy_i.i \ + RT_Policy_i.h RTCORBAC.h RTCORBAC.i RT_Policy_i.i \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ RT_Stub.h Private_Transport_Descriptor.h \ @@ -2714,7 +2706,11 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - RTCORBA.h rtcorba_export.h \ + RTCORBAC.h rtcorba_export.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2784,12 +2780,7 @@ endif # corba_messaging $(TAO_ROOT)/tao/try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ @@ -2900,7 +2891,11 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - RTCORBA.h rtcorba_export.h \ + RTCORBAC.h rtcorba_export.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2970,12 +2965,7 @@ endif # corba_messaging $(TAO_ROOT)/tao/try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ @@ -3121,6 +3111,9 @@ endif # corba_messaging $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ Thread_Pool.h \ + RTCORBAC.h \ + $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ + $(TAO_ROOT)/tao/Thread_Lane_Resources.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -3152,9 +3145,6 @@ endif # corba_messaging $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - RTCORBA.h \ - $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ - $(TAO_ROOT)/tao/Thread_Lane_Resources.i \ Thread_Pool.i \ RT_Thread_Lane_Resources_Manager.h \ rtcorba_export.h \ @@ -3325,8 +3315,11 @@ endif # corba_messaging $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - RT_PolicyFactory.h RTCORBA.h RTCORBAC.h RTCORBAC.i RT_Policy_i.h \ - RT_Policy_i.i RT_Protocols_Hooks.h \ + RT_PolicyFactory.h \ + RTCORBAC.h \ + rtcorba_export.h \ + RTCORBAC.i \ + RT_Policy_i.h RTCORBAC.h RT_Policy_i.i RT_Protocols_Hooks.h \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -3423,7 +3416,6 @@ endif # corba_messaging Linear_Priority_Mapping.h Linear_Priority_Mapping.i \ Direct_Priority_Mapping.h Direct_Priority_Mapping.i RT_ORB.h RT_ORB.i \ RT_Current.h RT_Current.i RT_Thread_Lane_Resources_Manager.h \ - rtcorba_export.h \ $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.h \ $(TAO_ROOT)/tao/Thread_Lane_Resources_Manager.i \ RT_Thread_Lane_Resources_Manager.i \ @@ -3854,7 +3846,7 @@ endif # corba_messaging $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - RT_Policy_i.h RTCORBA.h RTCORBAC.h RTCORBAC.i RT_Policy_i.i + RT_Policy_i.h RTCORBAC.h RTCORBAC.i RT_Policy_i.i .obj/RT_Policy_i.o .obj/RT_Policy_i.so .shobj/RT_Policy_i.o .shobj/RT_Policy_i.so: RT_Policy_i.cpp RT_Policy_i.h \ $(ACE_ROOT)/ace/pre.h \ @@ -3885,7 +3877,11 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - RTCORBA.h rtcorba_export.h \ + RTCORBAC.h rtcorba_export.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -3955,12 +3951,7 @@ endif # corba_messaging $(TAO_ROOT)/tao/try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ @@ -4281,7 +4272,7 @@ endif # corba_messaging $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - RT_Protocols_Hooks.i RT_Policy_i.h RTCORBA.h RT_Policy_i.i \ + RT_Protocols_Hooks.i RT_Policy_i.h RT_Policy_i.i \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ @@ -4648,8 +4639,7 @@ endif # corba_messaging $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ - rtcorba_export.h RT_Policy_i.h RTCORBA.h RTCORBAC.h RTCORBAC.i \ - RT_Policy_i.i + rtcorba_export.h RT_Policy_i.h RTCORBAC.h RTCORBAC.i RT_Policy_i.i .obj/RT_Stub_Factory.o .obj/RT_Stub_Factory.so .shobj/RT_Stub_Factory.o .shobj/RT_Stub_Factory.so: RT_Stub_Factory.cpp RT_Stub_Factory.h \ $(ACE_ROOT)/ace/pre.h \ @@ -4939,9 +4929,14 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ + RTCORBAC.h rtcorba_export.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ @@ -4954,70 +4949,38 @@ endif # corba_messaging $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Malloc_T.i \ $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ @@ -5026,77 +4989,21 @@ endif # corba_messaging $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ $(ACE_ROOT)/ace/Message_Block_T.i \ $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - RTCORBA.h rtcorba_export.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ $(TAO_ROOT)/tao/CDR.i \ @@ -5108,6 +5015,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ @@ -5125,6 +5034,11 @@ endif # corba_messaging $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ @@ -5136,8 +5050,83 @@ endif # corba_messaging $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.i \ RTCORBAC.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ $(TAO_ROOT)/tao/Thread_Lane_Resources.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ Thread_Pool.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp index 06dd80f2d13..ec3204eb284 100644 --- a/TAO/tao/RTCORBA/RTCORBA.cpp +++ b/TAO/tao/RTCORBA/RTCORBA.cpp @@ -2,12 +2,9 @@ #include "RTCORBA.h" #include "RT_ORB_Loader.h" -#include "RT_Protocols_Hooks.h" ACE_RCSID (RTCORBA, RTCORBA, "$Id$") -static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer; - TAO_RTCORBA_Initializer::TAO_RTCORBA_Initializer (void) { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_RT_ORB_Loader); diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h index 4429faf947a..e0541e6c572 100644 --- a/TAO/tao/RTCORBA/RTCORBA.h +++ b/TAO/tao/RTCORBA/RTCORBA.h @@ -32,6 +32,8 @@ public: TAO_RTCORBA_Initializer (void); }; +static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer; + #define TAO_RTCORBA_SAFE_INCLUDE #include "RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h index 672125529b9..856e3d63706 100644 --- a/TAO/tao/RTCORBA/RT_Current.h +++ b/TAO/tao/RTCORBA/RT_Current.h @@ -17,7 +17,10 @@ #include "tao/orbconf.h" -#include "RTCORBA.h" +#define TAO_RTCORBA_SAFE_INCLUDE +#include "RTCORBAC.h" +#undef TAO_RTCORBA_SAFE_INCLUDE + #include "tao/LocalObject.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h index efb30d24418..c16cb59a3b7 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -20,7 +20,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RTCORBA.h" +#define TAO_RTCORBA_SAFE_INCLUDE +#include "RTCORBAC.h" +#undef TAO_RTCORBA_SAFE_INCLUDE + #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index a5a66287766..55f7f5bd2b5 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -19,7 +19,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RTCORBA.h" +#define TAO_RTCORBA_SAFE_INCLUDE +#include "RTCORBAC.h" +#undef TAO_RTCORBA_SAFE_INCLUDE + #include "tao/LocalObject.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index bd0294f5559..838f8d8d856 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -6,7 +6,10 @@ ACE_RCSID (TAO, RT_ORBInitializer, "$Id$") -#include "RTCORBA.h" +#define TAO_RTCORBA_SAFE_INCLUDE +#include "tao/RTCORBA/RTCORBAC.h" +#undef TAO_RTCORBA_SAFE_INCLUDE + #include "RT_Policy_i.h" #include "RT_Protocols_Hooks.h" #include "Priority_Mapping_Manager.h" diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index 85fe4852b35..412ac3db2ec 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -20,7 +20,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RTCORBA.h" +#define TAO_RTCORBA_SAFE_INCLUDE +#include "RTCORBAC.h" +#undef TAO_RTCORBA_SAFE_INCLUDE + #include "tao/LocalObject.h" #include "ace/SString.h" diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h index a7291b1afbc..7eb98ddb5ad 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h @@ -155,7 +155,6 @@ protected: ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Protocols_Hooks) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Protocols_Hooks) -ACE_STATIC_SVC_REQUIRE(TAO_RT_Protocols_Hooks) #include "ace/post.h" #endif /* TAO_RT_PROTOCOLS_HOOKS_H */ diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index d31a6bb9445..f4743791218 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -18,10 +18,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Task.h" -#include "RTCORBA.h" +#define TAO_RTCORBA_SAFE_INCLUDE +#include "RTCORBAC.h" +#undef TAO_RTCORBA_SAFE_INCLUDE + #include "ace/Hash_Map_Manager.h" #include "tao/Thread_Lane_Resources.h" +#include "ace/Task.h" class TAO_Thread_Lane; diff --git a/TAO/tao/RTPortableServer/Makefile b/TAO/tao/RTPortableServer/Makefile index e722048135c..24646cd1f4c 100644 --- a/TAO/tao/RTPortableServer/Makefile +++ b/TAO/tao/RTPortableServer/Makefile @@ -29,7 +29,6 @@ CPP_SRCS += \ RT_Acceptor_Filters \ RT_Object_Adapter_Factory \ RT_POA \ - RT_POA_Initializer \ RT_Policy_Validator \ RT_Servant_Dispatcher @@ -172,23 +171,28 @@ endif # corba_messaging $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTPortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \ + $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ + $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ @@ -196,21 +200,6 @@ endif # corba_messaging $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \ - $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ - $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \ - $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ @@ -227,7 +216,17 @@ endif # corba_messaging $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \ + RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ RTPortableServerC.i RT_Object_Adapter_Factory.h \ $(TAO_ROOT)/tao/Adapter.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -389,9 +388,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \ - $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ @@ -515,9 +513,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Acceptor_Filter.i \ - $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \ - $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -581,287 +578,6 @@ endif # corba_messaging $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i -.obj/RT_Object_Adapter_Factory.o .obj/RT_Object_Adapter_Factory.so .shobj/RT_Object_Adapter_Factory.o .shobj/RT_Object_Adapter_Factory.so: RT_Object_Adapter_Factory.cpp \ - RT_Object_Adapter_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - rtportableserver_export.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(TAO_ROOT)/tao/Adapter.i \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - RT_POA_Initializer.h \ - $(TAO_ROOT)/tao/POA_Extension_Initializer.h \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ - $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i - .obj/RT_POA.o .obj/RT_POA.so .shobj/RT_POA.o .shobj/RT_POA.so: RT_POA.cpp RT_POA.h \ $(ACE_ROOT)/ace/pre.h \ rtportableserver_export.h \ @@ -1085,9 +801,9 @@ endif # corba_messaging $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableServer/POA.i \ - $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \ - $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ + RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ @@ -1106,7 +822,7 @@ endif # corba_messaging $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \ - RTPortableServer.h RTPortableServerC.h RTPortableServerC.i RT_POA.i \ + RTPortableServerC.i RT_POA.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1167,6 +883,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \ + $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ + $(TAO_ROOT)/tao/Thread_Lane_Resources.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1198,8 +916,6 @@ endif # corba_messaging $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ - $(TAO_ROOT)/tao/Thread_Lane_Resources.i \ $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \ $(TAO_ROOT)/tao/Acceptor_Registry.h \ $(TAO_ROOT)/tao/Acceptor_Registry.i \ @@ -1215,292 +931,6 @@ endif # corba_messaging $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp -.obj/RT_POA_Initializer.o .obj/RT_POA_Initializer.so .shobj/RT_POA_Initializer.o .shobj/RT_POA_Initializer.so: RT_POA_Initializer.cpp RT_POA_Initializer.h \ - $(ACE_ROOT)/ace/pre.h \ - rtportableserver_export.h \ - $(ACE_ROOT)/ace/config-sunos5.7.h \ - $(ACE_ROOT)/ace/config-sunos5.6.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ - $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Errno.h \ - $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl \ - $(TAO_ROOT)/tao/POA_Extension_Initializer.h \ - $(TAO_ROOT)/tao/corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/OS_Dirent.h \ - $(ACE_ROOT)/ace/OS_Dirent.inl \ - $(ACE_ROOT)/ace/OS_String.h \ - $(ACE_ROOT)/ace/OS_String.inl \ - $(ACE_ROOT)/ace/OS_Memory.h \ - $(ACE_ROOT)/ace/OS_Memory.inl \ - $(ACE_ROOT)/ace/OS_TLI.h \ - $(ACE_ROOT)/ace/OS_TLI.inl \ - $(ACE_ROOT)/ace/Min_Max.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Flag_Manip.h \ - $(ACE_ROOT)/ace/Flag_Manip.i \ - $(ACE_ROOT)/ace/Handle_Ops.h \ - $(ACE_ROOT)/ace/Handle_Ops.i \ - $(ACE_ROOT)/ace/Lib_Find.h \ - $(ACE_ROOT)/ace/Lib_Find.i \ - $(ACE_ROOT)/ace/Init_ACE.h \ - $(ACE_ROOT)/ace/Init_ACE.i \ - $(ACE_ROOT)/ace/Sock_Connect.h \ - $(ACE_ROOT)/ace/Sock_Connect.i \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ - $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread_Adapter.inl \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Unbounded_Set.h \ - $(ACE_ROOT)/ace/Node.h \ - $(ACE_ROOT)/ace/Node.cpp \ - $(ACE_ROOT)/ace/Unbounded_Set.inl \ - $(ACE_ROOT)/ace/Unbounded_Set.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.i \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ - $(ACE_ROOT)/ace/CDR_Base.inl \ - $(TAO_ROOT)/tao/try_macros.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/CORBA_macros.h \ - $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - RT_Servant_Dispatcher.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Dispatcher.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Unbounded_Queue.h \ - $(ACE_ROOT)/ace/Unbounded_Queue.inl \ - $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ - $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ - $(TAO_ROOT)/tao/Policy_Set.h \ - $(TAO_ROOT)/tao/Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \ - $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ - $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \ - RT_Policy_Validator.h \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Services.h \ - $(TAO_ROOT)/tao/Services.i \ - $(TAO_ROOT)/tao/CORBA_String.h \ - $(TAO_ROOT)/tao/CORBA_String.inl \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Policy_Manager.i \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Parser_Registry.i \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Service_Callbacks.i \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(TAO_ROOT)/tao/ORB_Core.i - .obj/RT_Policy_Validator.o .obj/RT_Policy_Validator.so .shobj/RT_Policy_Validator.o .shobj/RT_Policy_Validator.so: RT_Policy_Validator.cpp RT_Policy_Validator.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -1750,12 +1180,13 @@ endif # corba_messaging $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \ - $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \ $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.i \ $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \ + $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ + $(TAO_ROOT)/tao/Thread_Lane_Resources.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1787,8 +1218,6 @@ endif # corba_messaging $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ - $(TAO_ROOT)/tao/Thread_Lane_Resources.i \ $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \ $(TAO_ROOT)/tao/RTCORBA/RT_ORB.h \ $(TAO_ROOT)/tao/RTCORBA/RT_ORB.i \ @@ -2008,9 +1437,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/Policy_Set.i \ $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ - $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \ - $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ @@ -2048,8 +1476,10 @@ endif # corba_messaging $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableServer/POA.i \ - RTPortableServer.h RTPortableServerC.h RTPortableServerC.i RT_POA.i \ + RTPortableServerC.h RTPortableServerC.i RT_POA.i \ $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \ + $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ + $(TAO_ROOT)/tao/Thread_Lane_Resources.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Singleton.h \ @@ -2086,8 +1516,6 @@ endif # corba_messaging $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(TAO_ROOT)/tao/Thread_Lane_Resources.h \ - $(TAO_ROOT)/tao/Thread_Lane_Resources.i \ $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ diff --git a/TAO/tao/RTPortableServer/Makefile.bor b/TAO/tao/RTPortableServer/Makefile.bor index 89ff7ce5e8d..08f7b14405f 100644 --- a/TAO/tao/RTPortableServer/Makefile.bor +++ b/TAO/tao/RTPortableServer/Makefile.bor @@ -10,7 +10,6 @@ OBJFILES = \ $(OBJDIR)\RT_Acceptor_Filters.obj \ $(OBJDIR)\RT_Object_Adapter_Factory.obj \ $(OBJDIR)\RT_POA.obj \ - $(OBJDIR)\RT_POA_Initializer.obj \ $(OBJDIR)\RT_Policy_Validator.obj \ $(OBJDIR)\RT_Servant_Dispatcher.obj diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp index 6c37b0d28e2..db756286e2d 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp @@ -19,11 +19,7 @@ ACE_RCSID (RTPortableServer, RTPortableServer, "$Id$") -int -TAO_RT_POA_Initializer::init (void) +TAO_RTPortableServer_Initializer::TAO_RTPortableServer_Initializer (void) { - ACE_Service_Config::static_svcs ()-> - insert (&ace_svc_desc_TAO_RT_Object_Adapter_Factory); - - return 0; + ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_RT_Object_Adapter_Factory); } diff --git a/TAO/tao/RTPortableServer/RTPortableServer.h b/TAO/tao/RTPortableServer/RTPortableServer.h index 9f81e8c9076..e66fe4f6ec0 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.h +++ b/TAO/tao/RTPortableServer/RTPortableServer.h @@ -26,26 +26,16 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -class TAO_RTPortableServer_Export TAO_RT_POA_Initializer +#include "tao/RTCORBA/RTCORBA.h" + +class TAO_RTPortableServer_Export TAO_RTPortableServer_Initializer { public: - static int init (void); - // Used to force the initialization of the ORB code. + // Constructor. + TAO_RTPortableServer_Initializer (void); }; -#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS) - -typedef int (*TAO_Module_Initializer) (void); - -static TAO_Module_Initializer -TAO_Requires_RT_POA_Initializer = &TAO_RT_POA_Initializer::init; - -#else - -static int -TAO_Requires_RT_POA_Initializer = TAO_RT_POA_Initializer::init (); - -#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */ +static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer; #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE #include "RTPortableServerC.h" diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h index 6442f19a8e7..647f2c55632 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.h +++ b/TAO/tao/RTPortableServer/RTPortableServerC.h @@ -30,7 +30,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/RTCORBA/RTCORBA.h" +#define TAO_RTCORBA_SAFE_INCLUDE +#include "tao/RTCORBA/RTCORBAC.h" +#undef TAO_RTCORBA_SAFE_INCLUDE #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -63,7 +65,7 @@ TAO_NAMESPACE RTPortableServer class POA; typedef POA *POA_ptr; - + #endif /* end #if !defined */ @@ -74,23 +76,23 @@ TAO_NAMESPACE RTPortableServer { public: POA_var (void); // default constructor - POA_var (POA_ptr p) : ptr_ (p) {} + POA_var (POA_ptr p) : ptr_ (p) {} POA_var (const POA_var &); // copy constructor ~POA_var (void); // destructor - + POA_var &operator= (POA_ptr); POA_var &operator= (const POA_var &); POA_ptr operator-> (void) const; - + operator const POA_ptr &() const; operator POA_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn POA_ptr in (void) const; POA_ptr &inout (void); POA_ptr &out (void); POA_ptr _retn (void); POA_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static POA_ptr duplicate (POA_ptr); @@ -98,7 +100,7 @@ TAO_NAMESPACE RTPortableServer static POA_ptr nil (void); static POA_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: POA_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -125,7 +127,7 @@ TAO_NAMESPACE RTPortableServer operator POA_ptr &(); POA_ptr &ptr (void); POA_ptr operator-> (void); - + private: POA_ptr &ptr_; }; @@ -149,12 +151,12 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA static POA_ptr _duplicate (POA_ptr obj); static POA_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static POA_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static POA_ptr _nil (void) @@ -165,7 +167,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA virtual CORBA::Object_ptr create_reference_with_priority ( const char * intf, RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -177,7 +179,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA const PortableServer::ObjectId & oid, const char * intf, RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -188,7 +190,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA virtual PortableServer::ObjectId * activate_object_with_priority ( PortableServer::Servant p_servant, RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -201,7 +203,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA const PortableServer::ObjectId & oid, PortableServer::Servant p_servant, RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -212,12 +214,12 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: POA (); - + virtual ~POA (void); private: POA (const POA &); diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h index 48377781668..b54450aaecc 100644 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h +++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h @@ -29,7 +29,10 @@ #include "rtportableserver_export.h" #include "tao/Acceptor_Filter.h" -#include "tao/RTCORBA/RTCORBA.h" + +#define TAO_RTCORBA_SAFE_INCLUDE +#include "tao/RTCORBA/RTCORBAC.h" +#undef TAO_RTCORBA_SAFE_INCLUDE // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp index 881a41c1bae..d89884ff202 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp @@ -1,9 +1,10 @@ // $Id$ #include "RT_Object_Adapter_Factory.h" -#include "RT_POA_Initializer.h" #include "tao/PortableServer/Object_Adapter.h" #include "tao/ORB_Core.h" +#include "RT_Servant_Dispatcher.h" +#include "RT_Policy_Validator.h" ACE_RCSID (TAO_RTPortableServer, RT_Object_Adapter_Factory, @@ -17,21 +18,32 @@ TAO_RT_Object_Adapter_Factory::TAO_RT_Object_Adapter_Factory (void) TAO_Adapter* TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) { - // Register the RT_POA initializer so that it can register all of its - // hooks when the time comes. - TAO_RT_POA_Initializer *rt_initializer; - ACE_NEW_RETURN (rt_initializer, - TAO_RT_POA_Initializer, - 0); - orb_core->add_poa_extension_initializer (rt_initializer); - // Setup the POA_Current object in the ORB CORBA::Object_var current = new TAO_POA_Current; orb_core->poa_current (current.in ()); - return new TAO_Object_Adapter (orb_core->server_factory ()-> + TAO_Object_Adapter *object_adapter = 0; + ACE_NEW_RETURN (object_adapter, + TAO_Object_Adapter (orb_core->server_factory ()-> active_object_map_creation_parameters (), - *orb_core); + *orb_core), + 0); + + // Create and register the RT servant dispatcher. + TAO_RT_Servant_Dispatcher *rt_servant_dispatcher; + ACE_NEW_RETURN (rt_servant_dispatcher, + TAO_RT_Servant_Dispatcher, + 0); + object_adapter->servant_dispatcher (rt_servant_dispatcher); + + // Create and add the RT policy validator. + TAO_POA_RT_Policy_Validator *rt_validator; + ACE_NEW_RETURN (rt_validator, + TAO_POA_RT_Policy_Validator (*orb_core), + 0); + object_adapter->validator ().add_validator (rt_validator); + + return object_adapter; } ACE_FACTORY_DEFINE (TAO_RTPortableServer, TAO_RT_Object_Adapter_Factory) @@ -41,5 +53,3 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_Object_Adapter_Factory, &ACE_SVC_NAME (TAO_RT_Object_Adapter_Factory), ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) - - diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index befde6060d5..ab523dd99e9 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -23,8 +23,10 @@ #include "rtportableserver_export.h" #include "tao/PortableServer/POA.h" -#include "tao/RTCORBA/RTCORBA.h" -#include "RTPortableServer.h" + +#define TAO_RT_PORTABLESERVER_SAFE_INCLUDE +#include "RTPortableServerC.h" +#undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTPortableServer/RT_POA_Initializer.cpp b/TAO/tao/RTPortableServer/RT_POA_Initializer.cpp deleted file mode 100644 index d4552cff9b7..00000000000 --- a/TAO/tao/RTPortableServer/RT_POA_Initializer.cpp +++ /dev/null @@ -1,33 +0,0 @@ -// $Id$ - -#include "RT_POA_Initializer.h" -#include "RT_Servant_Dispatcher.h" -#include "RT_Policy_Validator.h" - -#include "tao/PortableServer/Object_Adapter.h" - -#include "tao/ORB_Core.h" - -ACE_RCSID(tao, RT_POA_Initializer, "$Id$") - -TAO_RT_POA_Initializer::~TAO_RT_POA_Initializer (void) -{ -} - -void -TAO_RT_POA_Initializer::register_hooks_impl (TAO_Object_Adapter &object_adapter, - CORBA::Environment &ACE_TRY_ENV) -{ - // Create and register the RT servant dispatcher. - TAO_RT_Servant_Dispatcher *rt_servant_dispatcher; - ACE_NEW (rt_servant_dispatcher, - TAO_RT_Servant_Dispatcher); - object_adapter.servant_dispatcher (rt_servant_dispatcher); - - // Create and add the RT policy validator. - TAO_POA_RT_Policy_Validator *rt_validator; - ACE_NEW (rt_validator, - TAO_POA_RT_Policy_Validator (object_adapter.orb_core ())); - - object_adapter.validator ().add_validator (rt_validator); -} diff --git a/TAO/tao/RTPortableServer/RT_POA_Initializer.h b/TAO/tao/RTPortableServer/RT_POA_Initializer.h deleted file mode 100644 index bd1bdfa1e7a..00000000000 --- a/TAO/tao/RTPortableServer/RT_POA_Initializer.h +++ /dev/null @@ -1,43 +0,0 @@ -// -*- C++ -*- - -// =================================================================== -/** - * @file RT_POA_Initializer.h - * - * $Id$ - * - * @author Frank Hunleth <fhunleth@cs.wustl.edu> - * @author Angelo Corsaro <corsaro@cs.wustl.edu> - */ -// =================================================================== - -#ifndef TAO_RT_POA_INITIALIZER_H -#define TAO_RT_POA_INITIALIZER_H -#include "ace/pre.h" - -#include "rtportableserver_export.h" -#include "tao/POA_Extension_Initializer.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// Forward declarations. -class TAO_POA_Policy_Set; -class TAO_ORB_Core; - -class TAO_RTPortableServer_Export TAO_RT_POA_Initializer - : public TAO_POA_Extension_Initializer -{ -public: - /// Destructor. - virtual ~TAO_RT_POA_Initializer (void); - -protected: - - virtual void register_hooks_impl (TAO_Object_Adapter &object_adapter, - CORBA::Environment &ACE_TRY_ENV); -}; - -#include "ace/post.h" -#endif /* TAO_RT_POA_INITIALIZER_H */ diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h index a659f257752..9d8c758122a 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h @@ -17,7 +17,10 @@ #include "rtportableserver_export.h" #include "tao/PortableServer/Servant_Dispatcher.h" -#include "tao/RTCORBA/RTCORBA.h" + +#define TAO_RTCORBA_SAFE_INCLUDE +#include "tao/RTCORBA/RTCORBAC.h" +#undef TAO_RTCORBA_SAFE_INCLUDE #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp b/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp index 714ec1891b4..c223aa17f50 100644 --- a/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp +++ b/TAO/tao/RTPortableServer/TAO_RTPortableServer.dsp @@ -169,10 +169,6 @@ SOURCE=.\RT_POA.cpp # End Source File
# Begin Source File
-SOURCE=.\RT_POA_Initializer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_Policy_Validator.cpp
# End Source File
# Begin Source File
@@ -205,10 +201,6 @@ SOURCE=.\RT_POA.h # End Source File
# Begin Source File
-SOURCE=.\RT_POA_Initializer.h
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_Policy_Validator.h
# End Source File
# Begin Source File
diff --git a/TAO/tao/RTPortableServer/TAO_RTPortableServer_Static.dsp b/TAO/tao/RTPortableServer/TAO_RTPortableServer_Static.dsp index c8dfedf2c79..e60913865c0 100644 --- a/TAO/tao/RTPortableServer/TAO_RTPortableServer_Static.dsp +++ b/TAO/tao/RTPortableServer/TAO_RTPortableServer_Static.dsp @@ -123,10 +123,6 @@ SOURCE=.\RT_POA.h # End Source File
# Begin Source File
-SOURCE=.\RT_POA_Initializer.h
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_Policy_Validator.h
# End Source File
# Begin Source File
@@ -163,10 +159,6 @@ SOURCE=.\RT_POA.cpp # End Source File
# Begin Source File
-SOURCE=.\RT_POA_Initializer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\RT_Policy_Validator.cpp
# End Source File
# Begin Source File
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp index 28cfb179d37..e93ce65786a 100644 --- a/TAO/tao/TAO.dsp +++ b/TAO/tao/TAO.dsp @@ -667,10 +667,6 @@ SOURCE=.\Pluggable_Messaging_Utils.cpp # End Source File
# Begin Source File
-SOURCE=.\POA_Extension_Initializer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Policy_Manager.cpp
# End Source File
# Begin Source File
@@ -1475,10 +1471,6 @@ SOURCE=.\Pluggable_Messaging_Utils.h # End Source File
# Begin Source File
-SOURCE=.\POA_Extension_Initializer.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Policy_Manager.h
# End Source File
# Begin Source File
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp index 4851372de4c..fa3e0ae5b44 100644 --- a/TAO/tao/TAO_Static.dsp +++ b/TAO/tao/TAO_Static.dsp @@ -599,10 +599,6 @@ SOURCE=.\Pluggable_Messaging_Utils.cpp # End Source File
# Begin Source File
-SOURCE=.\POA_Extension_Initializer.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Policy_Manager.cpp
# End Source File
# Begin Source File
@@ -1407,10 +1403,6 @@ SOURCE=.\Pluggable_Messaging_Utils.h # End Source File
# Begin Source File
-SOURCE=.\POA_Extension_Initializer.h
-# End Source File
-# Begin Source File
-
SOURCE=.\Policy_Manager.h
# End Source File
# Begin Source File
|