summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-02-18 09:07:14 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-02-18 09:07:14 +0000
commit685cbd31f0c2b28e550cff1226b6dea3f3150136 (patch)
tree91ba7fc4584511f31379702bdcf543da966f7f78 /TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
parent872553f0d5680b863cd6b1948c68ca20a7269e46 (diff)
downloadATCD-685cbd31f0c2b28e550cff1226b6dea3f3150136.tar.gz
ChangeLogTag: Fri Feb 18 17:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp')
-rw-r--r--TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp56
1 files changed, 30 insertions, 26 deletions
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index 4e95511f225..d0f3ff93c69 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -1,32 +1,33 @@
// @(#) $Id$
#include "Default_Servant_Dispatcher.h"
-#include "POA.h"
+#include "Root_POA.h"
-ACE_RCSID(tao, Default_Acceptor_Filter, "$Id$")
+ACE_RCSID(PortableServer,
+ Default_Servant_Dispatcher,
+ "$Id$")
TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
{
}
-TAO_POA *
-TAO_Default_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_Default_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_POA *poa;
+ TAO_Root_POA *poa = 0;
ACE_NEW_THROW_EX (poa,
- TAO_POA (name,
+ TAO_Root_POA (name,
poa_manager,
policies,
- parent,
+ 0,
lock,
thread_lock,
orb_core,
@@ -39,25 +40,28 @@ TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name,
}
void
-TAO_Default_Servant_Dispatcher::pre_invoke_remote_request (TAO_POA &,
- CORBA::Short,
- TAO_ServerRequest &,
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Servant_Dispatcher::pre_invoke_remote_request (
+ TAO_Root_POA &,
+ CORBA::Short,
+ TAO_ServerRequest &,
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
+ ACE_ENV_ARG_DECL_NOT_USED)
{
}
void
-TAO_Default_Servant_Dispatcher::pre_invoke_collocated_request (TAO_POA &,
- CORBA::Short,
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &
- ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Servant_Dispatcher::pre_invoke_collocated_request (
+ TAO_Root_POA &,
+ CORBA::Short,
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
+ ACE_ENV_ARG_DECL_NOT_USED)
{
}
void
-TAO_Default_Servant_Dispatcher::post_invoke (TAO_POA &,
- TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &)
+TAO_Default_Servant_Dispatcher::post_invoke (
+ TAO_Root_POA &,
+ TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
{
}