summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/Servant_Base.cpp
diff options
context:
space:
mode:
authornobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-16 21:19:02 +0000
committernobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-16 21:19:02 +0000
commit40fdc8a404e75ab03b68cc62e9987cf208fd8c30 (patch)
tree37d9c4d3abe4aefd8a34ed797883dd2cd4862ca7 /TAO/tao/PortableServer/Servant_Base.cpp
parentc254b281f1b9a4ca19dd0c3ee73a0654a7718909 (diff)
downloadATCD-40fdc8a404e75ab03b68cc62e9987cf208fd8c30.tar.gz
This commit was manufactured by cvs2svn to create branchtypecode-overhaul
'typecode-overhaul'.
Diffstat (limited to 'TAO/tao/PortableServer/Servant_Base.cpp')
-rw-r--r--TAO/tao/PortableServer/Servant_Base.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 4e6f1ed2dd0..ff320d9ee3c 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -152,8 +152,8 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
TAO_Stub *stub = 0;
TAO_POA_Current_Impl *poa_current_impl =
- static_cast<TAO_POA_Current_Impl *>
- (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+ ACE_static_cast(TAO_POA_Current_Impl *,
+ TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
CORBA::ORB_ptr servant_orb = 0;
@@ -162,6 +162,7 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
{
servant_orb = poa_current_impl->orb_core ().orb () ;
+
stub =
poa_current_impl->poa ()->key_to_stub (
poa_current_impl->object_key (),
@@ -215,7 +216,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req,
// Fetch the skeleton for this operation
if (this->_find (opname, skel,
- static_cast <unsigned int> (req.operation_length())) == -1)
+ ACE_static_cast (unsigned int, req.operation_length())) == -1)
{
ACE_THROW (CORBA::BAD_OPERATION ());
}
@@ -281,7 +282,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest &req,
// Fetch the skeleton for this operation
if (this->_find (opname, skel,
- static_cast <unsigned int> (req.operation_length())) == -1)
+ ACE_static_cast (unsigned int, req.operation_length())) == -1)
{
ACE_THROW (CORBA::BAD_OPERATION ());
}