summaryrefslogtreecommitdiff
path: root/TAO/tao/RTPortableServer
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/RTPortableServer')
-rw-r--r--TAO/tao/RTPortableServer/RTPortableServer.pidl7
-rw-r--r--TAO/tao/RTPortableServer/RTPortableServerA.cpp4
-rw-r--r--TAO/tao/RTPortableServer/RTPortableServerC.cpp12
-rw-r--r--TAO/tao/RTPortableServer/RTPortableServerC.h12
-rw-r--r--TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp22
-rw-r--r--TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp8
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.cpp135
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.h17
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.i11
-rw-r--r--TAO/tao/RTPortableServer/RT_Policy_Validator.cpp21
-rw-r--r--TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp77
-rw-r--r--TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h29
-rw-r--r--TAO/tao/RTPortableServer/diffs/RTPortableServer.diff129
13 files changed, 164 insertions, 320 deletions
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl
index 3e10b14cf66..2058dc1bf09 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.pidl
+++ b/TAO/tao/RTPortableServer/RTPortableServer.pidl
@@ -19,15 +19,14 @@
* -Wb,post_include="ace/post.h"
* RTPortableServer.pidl
*
- * 2. Then apply the patches in tao/RTPortableServer/diffs to the
- * generated code.
+ * 2. The generated files are ready to use
*/
#ifndef _RT_PORTABLE_SERVER_IDL_
#define _RT_PORTABLE_SERVER_IDL_
-#include "tao/PortableServer/PortableServer.pidl"
-#include "tao/RTCORBA/RTCORBA.pidl"
+#include "tao/PortableServer/PortableServer_include.pidl"
+#include "tao/RTCORBA/RTCORBA_include.pidl"
#pragma prefix "omg.org"
diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
index 2487ab3fc8a..46844097740 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
@@ -83,14 +83,14 @@ ACE_TEMPLATE_SPECIALIZATION
CORBA::Boolean
TAO::Any_Impl_T<RTPortableServer::POA>::marshal_value (TAO_OutputCDR &)
{
- return 0;
+ return false;
}
ACE_TEMPLATE_SPECIALIZATION
CORBA::Boolean
TAO::Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
{
- return 0;
+ return false;
}
// Copying insertion.
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index 63edacd946e..c3b8e885827 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -43,7 +43,7 @@
#endif /* !defined INLINE */
// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
// Arg traits specializations.
namespace TAO
@@ -158,22 +158,22 @@ RTPortableServer::POA::_is_a (
{
if (
!ACE_OS::strcmp (
- (char *)value,
+ value,
"IDL:omg.org/PortableServer/POA:2.3"
) ||
!ACE_OS::strcmp (
- (char *)value,
+ value,
"IDL:omg.org/RTPortableServer/POA:1.0"
) ||
!ACE_OS::strcmp (
- (char *)value,
+ value,
"IDL:omg.org/CORBA/LocalObject:1.0"
) ||
!ACE_OS::strcmp (
- (char *)value,
+ value,
"IDL:omg.org/CORBA/Object:1.0"
)
- )
+ )
{
return 1; // success using local knowledge
}
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index d648ef41913..4db19fdde67 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -47,8 +47,8 @@
#include "tao/Object.h"
#include "tao/Objref_VarOut_T.h"
-#include "tao/PortableServer/PortableServerC.h"
-#include "tao/RTCORBA/RTCORBA.h"
+#include "tao/PortableServer/PortableServer_includeC.h"
+#include "tao/RTCORBA/RTCORBA_includeC.h"
#if defined (TAO_EXPORT_MACRO)
#undef TAO_EXPORT_MACRO
@@ -72,7 +72,7 @@
#endif /* __BORLANDC__ */
// TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
namespace TAO
{
@@ -89,7 +89,7 @@ namespace RTPortableServer
{
// TAO_IDL - Generated from
- // be\be_interface.cpp:603
+ // be\be_interface.cpp:598
#if !defined (_RTPORTABLESERVER_POA__VAR_OUT_CH_)
#define _RTPORTABLESERVER_POA__VAR_OUT_CH_
@@ -139,7 +139,7 @@ namespace RTPortableServer
static POA_ptr _nil (void)
{
- return (POA_ptr)0;
+ return static_cast<POA_ptr> (0);
}
static void _tao_any_destructor (void *);
@@ -274,7 +274,7 @@ TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::PO
TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPortableServer::POA_ptr &);
// TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
#if defined (__ACE_INLINE__)
#include "RTPortableServerC.inl"
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index 7487e128b7d..a97308a22a2 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -11,8 +11,8 @@ ACE_RCSID(RTPortableServer,
#include "tao/ORB_Core.h"
#include "tao/Object.h"
#include "tao/Stub.h"
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/Root_POA.h"
#include "tao/RTCORBA/Thread_Pool.h"
#include "tao/Profile.h"
@@ -31,15 +31,15 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
// Lookup the target POA. Note that Object Adapter lock is held
// until <servant_upcall> dies.
- TAO_Object_Adapter::Servant_Upcall servant_upcall (orb_core);
- TAO_POA *poa =
+ TAO::Portable_Server::Servant_Upcall servant_upcall (orb_core);
+ TAO_Root_POA *poa =
servant_upcall.lookup_POA (object->_stubobj ()->object_key ()
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
// Get the thread pool associated with this POA.
TAO_Thread_Pool *target_thread_pool =
- (TAO_Thread_Pool *) poa->thread_pool ();
+ static_cast <TAO_Thread_Pool *> (poa->thread_pool ());
// If the target POA does not have a dedicated thread pool, then all
// calls to it are collocated.
@@ -52,7 +52,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
// Get the lane for this thread.
TAO_Thread_Lane *current_thread_lane =
- (TAO_Thread_Lane *) tss.lane_;
+ static_cast <TAO_Thread_Lane *> (tss.lane_);
TAO_Thread_Pool *current_thread_pool = 0;
@@ -77,20 +77,16 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
if (!current_thread_pool->with_lanes ())
return 1;
- // Grab the cached policies from the POA.
- TAO_POA_Cached_Policies &cached_policies =
- poa->cached_policies ();
-
// Grab the priority model used by the POA. Note that this cannot
// be NOT_SPECIFIED because NOT_SPECIFIED is not allowed with thread
// pool with lanes.
- TAO_POA_Cached_Policies::PriorityModel priority_model =
- cached_policies.priority_model ();
+ TAO::Portable_Server::Cached_Policies::PriorityModel priority_model =
+ poa->priority_model ();
// If the policy is CLIENT_PROPAGATED, then we are collocated
// because the current thread is of the correct priority :-) and
// we'll simple use the current thread to run the upcall.
- if (priority_model == TAO_POA_Cached_Policies::CLIENT_PROPAGATED)
+ if (priority_model == TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
return 1;
// Locate the target servant. We are really not interested in the
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
index bcfa7a8dbe6..84338ec2566 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
@@ -5,6 +5,7 @@
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/POA_Current.h"
#include "tao/ORB_Core.h"
#include "RT_Servant_Dispatcher.h"
#include "RT_Policy_Validator.h"
@@ -14,7 +15,6 @@ ACE_RCSID (RTPortableServer,
RT_Object_Adapter_Factory,
"$Id$")
-
TAO_RT_Object_Adapter_Factory::TAO_RT_Object_Adapter_Factory (void)
{
}
@@ -23,7 +23,7 @@ TAO_Adapter*
TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
{
// Setup the POA_Current object in the ORB
- CORBA::Object_var current = new TAO_POA_Current;
+ CORBA::Object_var current = new TAO::Portable_Server::POA_Current;
orb_core->poa_current (current.in ());
if (!orb_core->orb_params ()->disable_rt_collocation_resolver ())
@@ -43,14 +43,14 @@ TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
0);
// Create and register the RT servant dispatcher.
- TAO_RT_Servant_Dispatcher *rt_servant_dispatcher;
+ TAO_RT_Servant_Dispatcher *rt_servant_dispatcher = 0;
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;
+ TAO_POA_RT_Policy_Validator *rt_validator = 0;
ACE_NEW_RETURN (rt_validator,
TAO_POA_RT_Policy_Validator (*orb_core),
0);
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 10c586283d2..43dd02f08cb 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -31,30 +31,28 @@
# include "RT_POA.i"
#endif /* ! __ACE_INLINE__ */
-
ACE_RCSID (RTPortableServer,
RT_POA,
"$Id$")
-
-TAO_RT_POA::TAO_RT_POA (const TAO_POA::String &name,
+TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
TAO_POA_Manager &poa_manager,
const TAO_POA_Policy_Set &policies,
- TAO_POA *parent,
+ TAO_Root_POA *parent,
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
TAO_ORB_Core &orb_core,
TAO_Object_Adapter *object_adapter
ACE_ENV_ARG_DECL)
- : TAO_POA (name,
- poa_manager,
- policies,
- parent,
- lock,
- thread_lock,
- orb_core,
- object_adapter
- ACE_ENV_ARG_PARAMETER),
+ : TAO_Regular_POA (name,
+ poa_manager,
+ policies,
+ parent,
+ lock,
+ thread_lock,
+ orb_core,
+ object_adapter
+ ACE_ENV_ARG_PARAMETER),
thread_pool_ (0)
{
ACE_CHECK;
@@ -69,11 +67,11 @@ TAO_RT_POA::~TAO_RT_POA (void)
{
}
-TAO_POA *
+TAO_Root_POA *
TAO_RT_POA::new_POA (const String &name,
TAO_POA_Manager &poa_manager,
const TAO_POA_Policy_Set &policies,
- TAO_POA *parent,
+ TAO_Root_POA *parent,
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
TAO_ORB_Core &orb_core,
@@ -119,14 +117,14 @@ TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- this->cached_policies ().priority_model (
- TAO_POA_Cached_Policies::PriorityModel (rt_priority_model));
+ this->cached_policies_.priority_model (
+ TAO::Portable_Server::Cached_Policies::PriorityModel (rt_priority_model));
RTCORBA::Priority priority =
priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- this->cached_policies ().server_priority (priority);
+ this->cached_policies_.server_priority (priority);
}
}
@@ -188,8 +186,8 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
ACE_CHECK;
TAO_PriorityBandedConnectionPolicy *priority_bands_i =
- ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *,
- priority_bands.in ());
+ dynamic_cast <TAO_PriorityBandedConnectionPolicy *>
+ (priority_bands.in ());
if (priority_bands_i)
{
@@ -231,7 +229,7 @@ TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL)
// SERVER_DECLARED option for the PriorityModelPolicy then the ORB
// shall raise a WrongPolicy user exception.
if (this->cached_policies_.priority_model () !=
- TAO_POA_Cached_Policies::SERVER_DECLARED)
+ TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
{
ACE_THROW (PortableServer::POA::WrongPolicy ());
}
@@ -266,8 +264,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
ACE_CHECK_RETURN (0);
TAO_ServerProtocolPolicy *server_protocol =
- ACE_dynamic_cast (TAO_ServerProtocolPolicy *,
- server_protocol_policy.in ());
+ dynamic_cast <TAO_ServerProtocolPolicy *> (server_protocol_policy.in ());
// Filter for server protocol.
TAO_Server_Protocol_Acceptor_Filter filter (server_protocol->protocols_rep ());
@@ -304,7 +301,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
}
return
- this->TAO_POA::create_stub_object (object_key,
+ this->TAO_Regular_POA::create_stub_object (object_key,
type_id,
client_exposed_policies._retn (),
&filter,
@@ -316,7 +313,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
// the acceptors in the only thread lane that matches the priority
// of the object.
if (this->cached_policies_.priority_model () ==
- TAO_POA_Cached_Policies::SERVER_DECLARED)
+ TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
{
TAO_Thread_Lane **lanes =
this->thread_pool_->lanes ();
@@ -326,7 +323,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
++i)
{
if (lanes[i]->lane_priority () == priority)
- return this->TAO_POA::create_stub_object (object_key,
+ return this->TAO_Regular_POA::create_stub_object (object_key,
type_id,
client_exposed_policies._retn (),
&filter,
@@ -352,8 +349,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
ACE_CHECK_RETURN (0);
TAO_PriorityBandedConnectionPolicy *priority_bands_i =
- ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *,
- priority_bands.in ());
+ dynamic_cast <TAO_PriorityBandedConnectionPolicy *> (priority_bands.in ());
return this->create_stub_object (object_key,
type_id,
@@ -385,7 +381,7 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
// profiles than there are endpoints. In some cases, there can be
// less profiles than endpoints.
int result =
- mprofile.set (ACE_static_cast (CORBA::ULong, profile_count));
+ mprofile.set (static_cast <CORBA::ULong> (profile_count));
if (result == -1)
error = 1;
@@ -493,7 +489,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
CORBA::PolicyList *client_exposed_policies = 0;
ACE_NEW_THROW_EX (client_exposed_policies,
CORBA::PolicyList (),
- CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+ CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
ACE_CHECK_RETURN (0);
@@ -511,7 +507,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
if (poa_priority != TAO_INVALID_PRIORITY)
{
- TAO_POA_Cached_Policies::PriorityModel priority_model =
+ TAO::Portable_Server::Cached_Policies::PriorityModel priority_model =
this->cached_policies_.priority_model ();
// If the priority model is client propagated, let the client
@@ -519,7 +515,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
// the priority model is server declared, tell the client the
// servant's priority.
CORBA::Short priority;
- if (priority_model == TAO_POA_Cached_Policies::CLIENT_PROPAGATED)
+ if (priority_model == TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
priority = poa_priority;
else
priority = object_priority;
@@ -532,7 +528,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
ACE_NEW_THROW_EX (priority_model_policy,
TAO_PriorityModelPolicy (RTCORBA::PriorityModel (priority_model),
priority),
- CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+ CORBA::NO_MEMORY (TAO::VMCID,
CORBA::COMPLETED_NO));
ACE_CHECK_RETURN (0);
@@ -553,7 +549,7 @@ TAO_RT_POA::create_POA (const char *adapter_name,
PortableServer::POA::AdapterAlreadyExists,
PortableServer::POA::InvalidPolicy))
{
- PortableServer::POA_ptr poa = this->TAO_POA::create_POA (adapter_name,
+ PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name,
poa_manager,
policies
ACE_ENV_ARG_PARAMETER);
@@ -568,7 +564,7 @@ TAO_RT_POA::find_POA (const char *adapter_name,
ACE_THROW_SPEC ((CORBA::SystemException,
PortableServer::POA::AdapterNonExistent))
{
- PortableServer::POA_ptr poa = this->TAO_POA::find_POA (adapter_name,
+ PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name,
activate_it
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (poa);
@@ -581,7 +577,7 @@ TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->TAO_POA::destroy (etherealize_objects,
+ this->TAO_Regular_POA::destroy (etherealize_objects,
wait_for_completion
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
@@ -596,7 +592,7 @@ TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::ThreadPolicy_ptr policy =
- this->TAO_POA::create_thread_policy (value
+ this->TAO_Regular_POA::create_thread_policy (value
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (policy);
return policy;
@@ -610,7 +606,7 @@ TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::LifespanPolicy_ptr policy =
- this->TAO_POA::create_lifespan_policy (value
+ this->TAO_Regular_POA::create_lifespan_policy (value
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (policy);
return policy;
@@ -622,7 +618,7 @@ TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::IdUniquenessPolicy_ptr policy =
- this->TAO_POA::create_id_uniqueness_policy (value
+ this->TAO_Regular_POA::create_id_uniqueness_policy (value
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (policy);
return policy;
@@ -635,7 +631,7 @@ TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::IdAssignmentPolicy_ptr policy =
- this->TAO_POA::create_id_assignment_policy (value
+ this->TAO_Regular_POA::create_id_assignment_policy (value
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (policy);
return policy;
@@ -650,7 +646,7 @@ TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivatio
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::ImplicitActivationPolicy_ptr policy =
- this->TAO_POA::create_implicit_activation_policy (value
+ this->TAO_Regular_POA::create_implicit_activation_policy (value
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (policy);
return policy;
@@ -662,7 +658,7 @@ TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPol
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::ServantRetentionPolicy_ptr policy =
- this->TAO_POA::create_servant_retention_policy (value
+ this->TAO_Regular_POA::create_servant_retention_policy (value
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (policy);
return policy;
@@ -675,7 +671,7 @@ TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingP
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::RequestProcessingPolicy_ptr policy =
- this->TAO_POA::create_request_processing_policy (value
+ this->TAO_Regular_POA::create_request_processing_policy (value
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (policy);
return policy;
@@ -689,7 +685,7 @@ TAO_RT_POA::the_name (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
char * name =
- this->TAO_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->TAO_Regular_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (name);
return name;
}
@@ -699,7 +695,7 @@ TAO_RT_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::POA_ptr parent =
- this->TAO_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (parent);
return parent;
}
@@ -709,7 +705,7 @@ TAO_RT_POA::the_children (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::POAList *children =
- this->TAO_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->TAO_Regular_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (children);
return children;
}
@@ -719,7 +715,7 @@ TAO_RT_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::POAManager_ptr poa_manager =
- this->TAO_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->TAO_Regular_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (poa_manager);
return poa_manager;
}
@@ -732,7 +728,7 @@ TAO_RT_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
PortableServer::AdapterActivator_ptr activator =
- this->TAO_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->TAO_Regular_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (activator);
return activator;
}
@@ -742,7 +738,7 @@ TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activato
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->TAO_POA::the_activator (adapter_activator
+ this->TAO_Regular_POA::the_activator (adapter_activator
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
@@ -753,7 +749,7 @@ TAO_RT_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::POA::WrongPolicy))
{
PortableServer::ServantManager_ptr servant_manager =
- this->TAO_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->TAO_Regular_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (servant_manager);
return servant_manager;
}
@@ -764,7 +760,7 @@ TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
ACE_THROW_SPEC ((CORBA::SystemException,
PortableServer::POA::WrongPolicy))
{
- this->TAO_POA::set_servant_manager (imgr
+ this->TAO_Regular_POA::set_servant_manager (imgr
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
@@ -776,7 +772,7 @@ TAO_RT_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
PortableServer::POA::WrongPolicy))
{
PortableServer::Servant servant =
- this->TAO_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
+ this->TAO_Regular_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (servant);
return servant;
}
@@ -787,7 +783,7 @@ TAO_RT_POA::set_servant (PortableServer::Servant servant
ACE_THROW_SPEC ((CORBA::SystemException,
PortableServer::POA::WrongPolicy))
{
- this->TAO_POA::set_servant (servant
+ this->TAO_Regular_POA::set_servant (servant
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
@@ -802,7 +798,7 @@ TAO_RT_POA::activate_object (PortableServer::Servant p_servant
PortableServer::POA::WrongPolicy))
{
PortableServer::ObjectId *object_id =
- this->TAO_POA::activate_object (p_servant
+ this->TAO_Regular_POA::activate_object (p_servant
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (object_id);
return object_id;
@@ -817,7 +813,7 @@ TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
PortableServer::POA::ObjectAlreadyActive,
PortableServer::POA::WrongPolicy))
{
- this->TAO_POA::activate_object_with_id (id,
+ this->TAO_Regular_POA::activate_object_with_id (id,
p_servant
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
@@ -830,7 +826,7 @@ TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid
PortableServer::POA::ObjectNotActive,
PortableServer::POA::WrongPolicy))
{
- this->TAO_POA::deactivate_object (oid
+ this->TAO_Regular_POA::deactivate_object (oid
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
@@ -842,7 +838,7 @@ TAO_RT_POA::create_reference (const char *intf
PortableServer::POA::WrongPolicy))
{
CORBA::Object_ptr obj =
- this->TAO_POA::create_reference (intf
+ this->TAO_Regular_POA::create_reference (intf
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (obj);
return obj;
@@ -852,11 +848,10 @@ CORBA::Object_ptr
TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
const char *intf
ACE_ENV_ARG_DECL)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableServer::POA::WrongPolicy))
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Object_ptr obj =
- this->TAO_POA::create_reference_with_id (oid,
+ this->TAO_Regular_POA::create_reference_with_id (oid,
intf
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (obj);
@@ -871,7 +866,7 @@ TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant
PortableServer::POA::WrongPolicy))
{
PortableServer::ObjectId *object_id =
- this->TAO_POA::servant_to_id (p_servant
+ this->TAO_Regular_POA::servant_to_id (p_servant
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (object_id);
return object_id;
@@ -885,7 +880,7 @@ TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant
PortableServer::POA::WrongPolicy))
{
CORBA::Object_ptr obj =
- this->TAO_POA::servant_to_reference (p_servant
+ this->TAO_Regular_POA::servant_to_reference (p_servant
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (obj);
return obj;
@@ -901,7 +896,7 @@ TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference
PortableServer::POA::WrongPolicy))
{
PortableServer::Servant servant =
- this->TAO_POA::reference_to_servant (reference
+ this->TAO_Regular_POA::reference_to_servant (reference
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (servant);
return servant;
@@ -915,7 +910,7 @@ TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference
PortableServer::POA::WrongPolicy))
{
PortableServer::ObjectId *object_id =
- this->TAO_POA::reference_to_id (reference
+ this->TAO_Regular_POA::reference_to_id (reference
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (object_id);
return object_id;
@@ -929,7 +924,7 @@ TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid
PortableServer::POA::WrongPolicy))
{
PortableServer::Servant servant =
- this->TAO_POA::id_to_servant (oid
+ this->TAO_Regular_POA::id_to_servant (oid
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (servant);
return servant;
@@ -943,7 +938,7 @@ TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid
PortableServer::POA::WrongPolicy))
{
CORBA::Object_ptr obj =
- this->TAO_POA::id_to_reference (oid
+ this->TAO_Regular_POA::id_to_reference (oid
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (obj);
return obj;
@@ -953,13 +948,7 @@ CORBA::OctetSeq *
TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- return this->TAO_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 197857215b9..d3bbb2816d9 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -18,7 +18,7 @@
#include "rtportableserver_export.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Regular_POA.h"
#include "tao/orbconf.h"
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -34,9 +34,7 @@
// This is to remove "inherits via dominance" warnings from MSVC.
// MSVC is being a little too paranoid.
#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
#pragma warning(disable:4250)
#endif /* _MSC_VER */
@@ -46,7 +44,7 @@ class TAO_PriorityBandedConnectionPolicy;
class TAO_RTPortableServer_Export TAO_RT_POA :
public virtual RTPortableServer::POA,
- public virtual TAO_POA
+ public virtual TAO_Regular_POA
{
public:
@@ -207,8 +205,7 @@ public:
CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
const char *intf
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
- ACE_THROW_SPEC ((CORBA::SystemException,
- PortableServer::POA::WrongPolicy));
+ ACE_THROW_SPEC ((CORBA::SystemException));
PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -258,7 +255,7 @@ public:
TAO_RT_POA (const String &name,
TAO_POA_Manager &poa_manager,
const TAO_POA_Policy_Set &policies,
- TAO_POA *parent,
+ TAO_Root_POA *parent,
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
TAO_ORB_Core &orb_core,
@@ -272,10 +269,10 @@ public:
protected:
/// Template method for creating new POA's of this type.
- virtual TAO_POA *new_POA (const String &name,
+ virtual TAO_Root_POA *new_POA (const String &name,
TAO_POA_Manager &poa_manager,
const TAO_POA_Policy_Set &policies,
- TAO_POA *parent,
+ TAO_Root_POA *parent,
ACE_Lock &lock,
TAO_SYNCH_MUTEX &thread_lock,
TAO_ORB_Core &orb_core,
@@ -313,7 +310,7 @@ protected:
};
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */
diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i
index 07109328906..a0c51ad2e6d 100644
--- a/TAO/tao/RTPortableServer/RT_POA.i
+++ b/TAO/tao/RTPortableServer/RT_POA.i
@@ -2,6 +2,7 @@
// Exception macros
#include "tao/PortableServer/poa_macros.h"
+#include "tao/PortableServer/POA_Guard.h"
#include "tao/Environment.h"
ACE_INLINE CORBA::Object_ptr
@@ -67,11 +68,11 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
while (1)
{
- int wait_occurred_restart_call = 0;
+ int wait_occurred_restart_call = 0;
// Lock access for the duration of this transaction.
TAO_POA_GUARD_RETURN (0);
-
+
PortableServer::ObjectId *result =
this->activate_object_i (servant,
priority,
@@ -108,11 +109,11 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId
while (1)
{
- int wait_occurred_restart_call = 0;
-
+ int wait_occurred_restart_call = 0;
+
// Lock access for the duration of this transaction.
TAO_POA_GUARD;
-
+
this->activate_object_with_id_i (oid,
servant,
priority,
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index cdea3350ccd..97242642f66 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -2,8 +2,8 @@
#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-#include "tao/PortableServer/PortableServerC.h"
#include "tao/PortableServer/POA_Cached_Policies.h"
+#include "tao/PortableServer/PortableServer.h"
#include "tao/RTCORBA/RT_Policy_i.h"
#include "tao/RTCORBA/Thread_Pool.h"
#include "tao/RTCORBA/RT_ORB.h"
@@ -89,8 +89,8 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
ACE_CHECK;
TAO_ServerProtocolPolicy *server_protocol =
- ACE_dynamic_cast (TAO_ServerProtocolPolicy *,
- server_protocol_policy.in ());
+ dynamic_cast <TAO_ServerProtocolPolicy *>
+ (server_protocol_policy.in ());
RTCORBA::ProtocolList &protocols =
server_protocol->protocols_rep ();
@@ -162,8 +162,8 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
// Initialize to the default priority/priority model.
CORBA::Short priority =
TAO_INVALID_PRIORITY;
- TAO_POA_Cached_Policies::PriorityModel rt_priority_model =
- TAO_POA_Cached_Policies::NOT_SPECIFIED;
+ TAO::Portable_Server::Cached_Policies::PriorityModel rt_priority_model =
+ TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED;
CORBA::Policy_var policy =
policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
@@ -181,7 +181,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
ACE_CHECK;
rt_priority_model =
- TAO_POA_Cached_Policies::PriorityModel (
+ TAO::Portable_Server::Cached_Policies::PriorityModel (
priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER));
ACE_CHECK;
@@ -233,7 +233,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
if (bands_policy != 0)
{
// Checks 0.
- if (rt_priority_model == TAO_POA_Cached_Policies::NOT_SPECIFIED)
+ if (rt_priority_model == TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED)
ACE_THROW (PortableServer::POA::InvalidPolicy ());
RTCORBA::PriorityBands &bands =
@@ -262,7 +262,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
}
// Check 3.
- if (rt_priority_model == TAO_POA_Cached_Policies::SERVER_DECLARED)
+ if (rt_priority_model == TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
{
int match = 0;
for (CORBA::ULong i = 0; i < bands.length (); ++i)
@@ -324,7 +324,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
// model is SERVER_DECLARED, make sure we have at least one thread
// lane that can provide service for the specified SERVER_DECLARED
// priority.
- if (rt_priority_model == TAO_POA_Cached_Policies::SERVER_DECLARED)
+ if (rt_priority_model == TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
{
// If this POA is using the default thread pool (which doesn't
// have lanes) or a thread pool without lanes, we are done with
@@ -580,8 +580,7 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
ACE_CHECK_RETURN (0);
TAO_RT_ORB *tao_rt_orb =
- ACE_dynamic_cast (TAO_RT_ORB *,
- rt_orb.in ());
+ dynamic_cast <TAO_RT_ORB *> (rt_orb.in ());
TAO_Thread_Pool_Manager &tp_manager =
tao_rt_orb->tp_manager ();
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 5ca6b1c1e94..cffae210ea4 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -22,17 +22,16 @@ ACE_RCSID (RTPortableServer,
RT_Servant_Dispatcher,
"$Id$")
-
TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
{
}
void
TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
- TAO_POA &poa,
+ TAO_Root_POA &poa,
CORBA::Short servant_priority,
TAO_ServerRequest &req,
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
ACE_ENV_ARG_DECL)
{
TAO_Service_Context &request_service_context =
@@ -40,7 +39,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
TAO_Service_Context &reply_service_context = req.reply_service_context ();
TAO_Thread_Pool *thread_pool =
- (TAO_Thread_Pool *) poa.thread_pool ();
+ static_cast <TAO_Thread_Pool *> (poa.thread_pool ());
if (thread_pool != 0 &&
thread_pool->with_lanes ())
@@ -57,7 +56,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
/// Get the lane attribute in TSS.
TAO_Thread_Lane *lane =
- (TAO_Thread_Lane *) tss->lane_;
+ static_cast<TAO_Thread_Lane *> (tss->lane_);
ACE_ASSERT (lane->pool ().id () ==
thread_pool->id ());
@@ -81,19 +80,17 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
const char *priority_model;
RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
- TAO_POA_Cached_Policies &cached_policies =
- poa.cached_policies ();
// NOT_SPECIFIED PriorityModel processing.
- if (cached_policies.priority_model () ==
- TAO_POA_Cached_Policies::NOT_SPECIFIED)
+ if (poa.priority_model () ==
+ TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED)
{
priority_model = "RTCORBA::NOT_SPECIFIED";
}
// CLIENT_PROPAGATED PriorityModel processing.
- else if (cached_policies.priority_model () ==
- TAO_POA_Cached_Policies::CLIENT_PROPAGATED)
+ else if (poa.priority_model () ==
+ TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
{
priority_model = "RTCORBA::CLIENT_PROPAGATED";
@@ -105,14 +102,14 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
&context) == 1)
{
// Extract the target priority
- TAO_InputCDR cdr (ACE_reinterpret_cast
- (const char*,
- context->context_data.get_buffer ()),
+ TAO_InputCDR cdr (reinterpret_cast
+ <const char*>
+ (context->context_data.get_buffer ()),
context->context_data.length ());
CORBA::Boolean byte_order;
if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
ACE_THROW (CORBA::MARSHAL ());
- cdr.reset_byte_order (ACE_static_cast(int,byte_order));
+ cdr.reset_byte_order (static_cast<int> (byte_order));
if ((cdr >> target_priority) == 0)
ACE_THROW (CORBA::MARSHAL ());
@@ -126,7 +123,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
{
// Use default priority if none came in the request.
// (Request must have come from a non-RT ORB.)
- target_priority = cached_policies.server_priority ();
+ target_priority = poa.server_priority ();
}
}
else
@@ -213,7 +210,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
CORBA::COMPLETED_NO));
pre_invoke_state.state_ =
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
if (TAO_debug_level > 0)
{
@@ -269,13 +266,13 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
}
void
-TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_POA &poa,
+TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa,
CORBA::Short servant_priority,
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
ACE_ENV_ARG_DECL)
{
TAO_Thread_Pool *thread_pool =
- (TAO_Thread_Pool *) poa.thread_pool ();
+ static_cast <TAO_Thread_Pool *> (poa.thread_pool ());
if (thread_pool == 0 ||
thread_pool->with_lanes ())
@@ -287,11 +284,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_POA &poa,
return;
}
- TAO_POA_Cached_Policies &cached_policies =
- poa.cached_policies ();
-
- if (cached_policies.priority_model () !=
- TAO_POA_Cached_Policies::SERVER_DECLARED ||
+ if (poa.priority_model () !=
+ TAO::Portable_Server::Cached_Policies::SERVER_DECLARED ||
servant_priority == TAO_INVALID_PRIORITY)
{
//
@@ -327,20 +321,20 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_POA &poa,
CORBA::COMPLETED_NO));
pre_invoke_state.state_ =
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
}
}
void
-TAO_RT_Servant_Dispatcher::post_invoke (TAO_POA &poa,
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state)
+TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state)
{
if (pre_invoke_state.state_ ==
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED)
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED)
{
pre_invoke_state.state_ =
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::NO_ACTION_REQUIRED;
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::NO_ACTION_REQUIRED;
ACE_DECLARE_NEW_CORBA_ENV;
@@ -371,24 +365,23 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_POA &poa,
}
}
-TAO_POA *
-TAO_RT_Servant_Dispatcher::create_POA (const ACE_CString &name,
- TAO_POA_Manager &poa_manager,
- const TAO_POA_Policy_Set &policies,
- TAO_POA *parent,
- ACE_Lock &lock,
- TAO_SYNCH_MUTEX &thread_lock,
- TAO_ORB_Core &orb_core,
- TAO_Object_Adapter *object_adapter
- ACE_ENV_ARG_DECL)
+TAO_Root_POA *
+TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
+ TAO_POA_Manager &poa_manager,
+ const TAO_POA_Policy_Set &policies,
+ ACE_Lock &lock,
+ TAO_SYNCH_MUTEX &thread_lock,
+ TAO_ORB_Core &orb_core,
+ TAO_Object_Adapter *object_adapter
+ ACE_ENV_ARG_DECL)
{
- TAO_RT_POA *poa;
+ TAO_RT_POA *poa = 0;
ACE_NEW_THROW_EX (poa,
TAO_RT_POA (name,
poa_manager,
policies,
- parent,
+ 0,
lock,
thread_lock,
orb_core,
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index d98684a4c92..64c083f008b 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -44,32 +44,31 @@ public:
virtual ~TAO_RT_Servant_Dispatcher (void);
/// Pre_invoke remote request.
- void pre_invoke_remote_request (TAO_POA &poa,
+ void pre_invoke_remote_request (TAO_Root_POA &poa,
CORBA::Short servant_priority,
TAO_ServerRequest &req,
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
ACE_ENV_ARG_DECL);
/// Pre_invoke collocated request.
- void pre_invoke_collocated_request (TAO_POA &poa,
+ void pre_invoke_collocated_request (TAO_Root_POA &poa,
CORBA::Short servant_priority,
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
ACE_ENV_ARG_DECL);
/// Post_invoke request.
- void post_invoke (TAO_POA &poa,
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
+ void post_invoke (TAO_Root_POA &poa,
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
/// Factory method for creating new POA's.
- TAO_POA *create_POA (const ACE_CString &name,
- TAO_POA_Manager &poa_manager,
- const TAO_POA_Policy_Set &policies,
- TAO_POA *parent,
- ACE_Lock &lock,
- TAO_SYNCH_MUTEX &thread_lock,
- TAO_ORB_Core &orb_core,
- TAO_Object_Adapter *object_adapter
- ACE_ENV_ARG_DECL);
+ TAO_Root_POA *create_Root_POA (const ACE_CString &name,
+ TAO_POA_Manager &poa_manager,
+ const TAO_POA_Policy_Set &policies,
+ ACE_Lock &lock,
+ TAO_SYNCH_MUTEX &thread_lock,
+ TAO_ORB_Core &orb_core,
+ TAO_Object_Adapter *object_adapter
+ ACE_ENV_ARG_DECL);
};
#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/diffs/RTPortableServer.diff b/TAO/tao/RTPortableServer/diffs/RTPortableServer.diff
deleted file mode 100644
index 4f7089d6a77..00000000000
--- a/TAO/tao/RTPortableServer/diffs/RTPortableServer.diff
+++ /dev/null
@@ -1,129 +0,0 @@
---- orig/RTPortableServerC.h 2003-12-29 10:19:56.000000000 -0600
-+++ RTPortableServerC.h 2003-12-29 11:31:43.000000000 -0600
-@@ -45,8 +45,8 @@
- #include "tao/Object.h"
- #include "tao/Objref_VarOut_T.h"
-
--#include "../PortableServer/PortableServerC.h"
--#include "../RTCORBA/RTCORBAC.h"
-+#include "tao/PortableServer/PortableServerC.h"
-+#include "tao/RTCORBA/RTCORBA.h"
-
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -228,11 +228,6 @@
- #endif /* end #if !defined */
-
- // TAO_IDL - Generated from
-- // be/be_visitor_typecode/typecode_decl.cpp:44
--
-- TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
--
--// TAO_IDL - Generated from
- // be/be_visitor_module/module_ch.cpp:66
-
- } // module RTPortableServer
---- orig/RTPortableServerC.cpp 2003-12-29 10:19:56.000000000 -0600
-+++ RTPortableServerC.cpp 2003-12-29 11:29:44.000000000 -0600
-@@ -199,40 +199,6 @@
- return 0;
- }
-
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_RTPortableServer_POA[] =
--{
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 37,
-- ACE_NTOHL (0x49444c3a),
-- ACE_NTOHL (0x6f6d672e),
-- ACE_NTOHL (0x6f72672f),
-- ACE_NTOHL (0x5254506f),
-- ACE_NTOHL (0x72746162),
-- ACE_NTOHL (0x6c655365),
-- ACE_NTOHL (0x72766572),
-- ACE_NTOHL (0x2f504f41),
-- ACE_NTOHL (0x3a312e30),
-- ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTPortableServer/POA:1.0
-- 4,
-- ACE_NTOHL (0x504f4100), // name = POA
-- };
--
--static CORBA::TypeCode _tc_TAO_tc_RTPortableServer_POA (
-- CORBA::tk_objref,
-- sizeof (_oc_RTPortableServer_POA),
-- (char *) &_oc_RTPortableServer_POA,
-- 0,
-- sizeof (RTPortableServer::POA)
-- );
--
--namespace RTPortableServer
--{
-- ::CORBA::TypeCode_ptr _tc_POA =
-- &_tc_TAO_tc_RTPortableServer_POA;
--}
-
- // TAO_IDL - Generated from
- // be/be_visitor_root/root.cpp:1725
---- orig/RTPortableServerA.h 2003-12-29 10:19:56.000000000 -0600
-+++ RTPortableServerA.h 2003-12-29 11:29:01.000000000 -0600
-@@ -40,6 +40,14 @@
- #endif
- #define TAO_EXPORT_MACRO TAO_RTPortableServer_Export
-
-+namespace RTPortableServer
-+{
-+ // TAO_IDL - Generated from
-+ // be/be_visitor_typecode/typecode_decl.cpp:44
-+
-+ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
-+}
-+
- // TAO_IDL - Generated from
- // be/be_visitor_interface/any_op_ch.cpp:52
-
---- orig/RTPortableServerA.cpp 2003-12-29 10:19:56.000000000 -0600
-+++ RTPortableServerA.cpp 2003-12-29 11:29:52.000000000 -0600
-@@ -32,6 +32,41 @@
-
- // TAO_IDL - Generated from
- // be/be_visitor_interface/any_op_cs.cpp:50
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_RTPortableServer_POA[] =
-+{
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 37,
-+ ACE_NTOHL (0x49444c3a),
-+ ACE_NTOHL (0x6f6d672e),
-+ ACE_NTOHL (0x6f72672f),
-+ ACE_NTOHL (0x5254506f),
-+ ACE_NTOHL (0x72746162),
-+ ACE_NTOHL (0x6c655365),
-+ ACE_NTOHL (0x72766572),
-+ ACE_NTOHL (0x2f504f41),
-+ ACE_NTOHL (0x3a312e30),
-+ ACE_NTOHL (0x0), // repository ID = IDL:omg.org/RTPortableServer/POA:1.0
-+ 4,
-+ ACE_NTOHL (0x504f4100), // name = POA
-+ };
-+
-+static CORBA::TypeCode _tc_TAO_tc_RTPortableServer_POA (
-+ CORBA::tk_objref,
-+ sizeof (_oc_RTPortableServer_POA),
-+ (char *) &_oc_RTPortableServer_POA,
-+ 0,
-+ sizeof (RTPortableServer::POA)
-+ );
-+
-+namespace RTPortableServer
-+{
-+ ::CORBA::TypeCode_ptr _tc_POA =
-+ &_tc_TAO_tc_RTPortableServer_POA;
-+}
-+
-
- ACE_TEMPLATE_SPECIALIZATION
- CORBA::Boolean
View Lorry Controller Status