diff options
Diffstat (limited to 'TAO/tao/ORB_Core.h')
| -rw-r--r-- | TAO/tao/ORB_Core.h | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 486ee1cf4eb..f9dcaac36a6 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -28,7 +28,6 @@ class TAO_Client_Connection_Handler; class TAO_POA; class TAO_POA_Current; -class TAO_POA_Current_Impl; class TAO_POA_Manager; class TAO_POA_Policies; class TAO_Acceptor; @@ -39,7 +38,6 @@ class TAO_Resource_Factory; class TAO_Client_Strategy_Factory; class TAO_Server_Strategy_Factory; class TAO_Connection_Cache; -class TAO_ORB_Core_TSS_Resources; // **************************************************************** @@ -75,8 +73,13 @@ public: TAO_ORB_Parameters *orb_params (void); // Accessor for the ORB parameters. - TAO_POA_Current &poa_current (void) const; - // Accessor to the POA current. + TAO_POA_Current *poa_current (void); + // Accessor which returns a pointer to a structure containing + // context on the current POA upcall. + + TAO_POA_Current *poa_current (TAO_POA_Current *new_current); + // Sets the thread-specific pointer to the new POA Current state, + // returning a pointer to the existing POA Current state. // = Set/get the connector registry - used to just be the connector. TAO_Connector_Registry *connector_registry (TAO_Connector_Registry *c); @@ -112,7 +115,7 @@ public: TAO_Object_Adapter *object_adapter (void); // Get <Object Adapter>. - int inherit_from_parent_thread (TAO_ORB_Core_TSS_Resources *tss_resources); + int inherit_from_parent_thread (TAO_ORB_Core *p); // A spawned thread needs to inherit some properties/objects from // the spawning thread in order to serve requests. Return 0 if // it successfully inherits from the parent, -1 otherwise. @@ -360,13 +363,6 @@ protected: TAO_Policy_Manager_Impl default_policies_; // The default policies. #endif /* TAO_HAS_CORBA_MESSAGING */ - - TAO_POA_Current *poa_current_; - // POA current. - // - // Note that this is a pointer in order to reduce the include file - // dependencies. - // }; // **************************************************************** @@ -392,7 +388,7 @@ public: ACE_Reactor *reactor_; // Used for responding to I/O reactively - TAO_POA_Current_Impl *poa_current_impl_; + TAO_POA_Current *poa_current_; // Points to structure containing state for the current upcall // context in this thread. Note that it does not come from the // resource factory because it must always be held in @@ -413,7 +409,7 @@ public: // The initial PolicyCurrent for this thread. Should be a TSS // resource. - TAO_Policy_Current *policy_current_; + TAO_Policy_Current* policy_current_; // This pointer is reset by the POA on each upcall. #endif /* TAO_HAS_CORBA_MESSAGING */ @@ -429,9 +425,6 @@ public: // **************************************************************** -typedef ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX> - TAO_ORB_CORE_TSS_RESOURCES; - extern TAO_Export TAO_ORB_Core *TAO_ORB_Core_instance (void); #if defined (__ACE_INLINE__) |