summaryrefslogtreecommitdiff
path: root/TAO/tao/Domain
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Domain')
-rw-r--r--TAO/tao/Domain/DomainS.cpp140
-rw-r--r--TAO/tao/Domain/DomainS.h243
-rw-r--r--TAO/tao/Domain/DomainS.inl24
-rw-r--r--TAO/tao/Domain/DomainS_T.h62
-rw-r--r--TAO/tao/Domain/DomainS_T.inl50
5 files changed, 247 insertions, 272 deletions
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index cb4c792f819..b27461c2904 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -301,13 +301,12 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Stra
TAO::Collocation_Strategy
POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::get_strategy (
CORBA::Object_ptr obj
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO::Collocation_Strategy strategy =
- TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+ TAO_ORB_Core::collocation_strategy (obj);
return strategy;
}
@@ -321,7 +320,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
const char * op,
size_t op_len,
TAO::Collocation_Strategy strategy
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((CORBA::Exception))
{
@@ -334,7 +333,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
op,
op_len,
strategy
- ACE_ENV_ARG_PARAMETER);
+ );
}
//
@@ -383,7 +382,7 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
TAO_Abstract_ServantBase *servant,
TAO::Argument ** args,
int
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -394,9 +393,8 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
(servant)
->get_domain_policy (
((TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val *) args[1])->arg ()
- ACE_ENV_ARG_PARAMETER
+
);
- ACE_CHECK;
}
@@ -443,7 +441,7 @@ namespace POA_CORBA
{
}
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void execute (void)
{
TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< CORBA::Policy> (
@@ -460,7 +458,7 @@ namespace POA_CORBA
retval =
this->servant_->get_domain_policy (
arg_1
- ACE_ENV_ARG_PARAMETER);
+ );
}
@@ -480,7 +478,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
- ACE_ENV_ARG_DECL
+
)
{
@@ -519,8 +517,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
, exceptions
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ );
}
@@ -548,7 +545,7 @@ namespace POA_CORBA
{
}
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -565,7 +562,7 @@ namespace POA_CORBA
retval =
this->servant_-> _is_a (
arg_1
- ACE_ENV_ARG_PARAMETER);
+ );
}
@@ -580,7 +577,7 @@ void POA_CORBA::DomainManager::_is_a_skel (
TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
- ACE_ENV_ARG_DECL
+
)
{
@@ -619,8 +616,7 @@ void POA_CORBA::DomainManager::_is_a_skel (
, exceptions
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ );
}
@@ -645,7 +641,7 @@ namespace POA_CORBA
{
}
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -655,7 +651,7 @@ namespace POA_CORBA
retval =
this->servant_-> _non_existent (
- ACE_ENV_SINGLE_ARG_PARAMETER);
+ );
}
@@ -670,7 +666,7 @@ void POA_CORBA::DomainManager::_non_existent_skel (
TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
- ACE_ENV_ARG_DECL
+
)
{
@@ -707,8 +703,7 @@ void POA_CORBA::DomainManager::_non_existent_skel (
, exceptions
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ );
}
@@ -723,7 +718,7 @@ void POA_CORBA::DomainManager::_interface_skel (
TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
- ACE_ENV_ARG_DECL
+
)
{
TAO_IFR_Client_Adapter *_tao_adapter =
@@ -733,15 +728,14 @@ void POA_CORBA::DomainManager::_interface_skel (
if (_tao_adapter == 0)
{
- ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
+ throw ( ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
CORBA::COMPLETED_NO));
}
POA_CORBA::DomainManager * const impl =
static_cast<POA_CORBA::DomainManager *> (servant);
CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ impl->_get_interface ();
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
@@ -756,7 +750,7 @@ void POA_CORBA::DomainManager::_interface_skel (
if (_tao_result == 0)
{
- ACE_THROW (CORBA::MARSHAL ());
+ throw ::CORBA::MARSHAL ();
}
}
@@ -781,7 +775,7 @@ namespace POA_CORBA
{
}
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
@@ -791,7 +785,7 @@ namespace POA_CORBA
retval =
this->servant_-> _get_component (
- ACE_ENV_SINGLE_ARG_PARAMETER);
+ );
}
@@ -806,7 +800,7 @@ void POA_CORBA::DomainManager::_component_skel (
TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
- ACE_ENV_ARG_DECL
+
)
{
@@ -843,14 +837,13 @@ void POA_CORBA::DomainManager::_component_skel (
, exceptions
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ );
}
CORBA::Boolean POA_CORBA::DomainManager::_is_a (
const char* value
- ACE_ENV_ARG_DECL_NOT_USED
+
)
{
return
@@ -877,23 +870,22 @@ const char* POA_CORBA::DomainManager::_interface_repository_id (void) const
void POA_CORBA::DomainManager::_dispatch (
TAO_ServerRequest & req,
void * servant_upcall
- ACE_ENV_ARG_DECL
+
)
{
this->synchronous_upcall_dispatch (req,
servant_upcall,
this
- ACE_ENV_ARG_PARAMETER);
+ );
}
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:891
CORBA::DomainManager *
-POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::DomainManager::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ TAO_Stub *stub = this->_create_stub ();
TAO_Stub_Auto_Ptr safe_stub (stub);
CORBA::Object_ptr tmp = CORBA::Object::_nil ();
@@ -1062,13 +1054,12 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionP
TAO::Collocation_Strategy
POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::get_strategy (
CORBA::Object_ptr obj
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO::Collocation_Strategy strategy =
- TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+ TAO_ORB_Core::collocation_strategy (obj);
return strategy;
}
@@ -1082,7 +1073,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
const char * op,
size_t op_len,
TAO::Collocation_Strategy strategy
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((CORBA::Exception))
{
@@ -1095,7 +1086,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
op,
op_len,
strategy
- ACE_ENV_ARG_PARAMETER);
+ );
}
//
@@ -1144,7 +1135,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
TAO_Abstract_ServantBase *servant,
TAO::Argument ** args,
int
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -1155,9 +1146,8 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
->make_domain_manager (
((TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val *) args[1])->arg (),
((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
- ACE_ENV_ARG_PARAMETER
+
);
- ACE_CHECK;
}
@@ -1205,7 +1195,7 @@ namespace POA_CORBA
{
}
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void execute (void)
{
TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type arg_1 =
TAO::Portable_Server::get_in_arg< CORBA::InterfaceDef> (
@@ -1222,7 +1212,7 @@ namespace POA_CORBA
this->servant_->make_domain_manager (
arg_1
, arg_2
- ACE_ENV_ARG_PARAMETER);
+ );
}
@@ -1242,7 +1232,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
- ACE_ENV_ARG_DECL
+
)
{
@@ -1283,8 +1273,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
, exceptions
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ );
}
@@ -1312,7 +1301,7 @@ namespace POA_CORBA
{
}
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -1329,7 +1318,7 @@ namespace POA_CORBA
retval =
this->servant_-> _is_a (
arg_1
- ACE_ENV_ARG_PARAMETER);
+ );
}
@@ -1344,7 +1333,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
- ACE_ENV_ARG_DECL
+
)
{
@@ -1383,8 +1372,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
, exceptions
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ );
}
@@ -1409,7 +1397,7 @@ namespace POA_CORBA
{
}
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void execute (void)
{
TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
@@ -1419,7 +1407,7 @@ namespace POA_CORBA
retval =
this->servant_-> _non_existent (
- ACE_ENV_SINGLE_ARG_PARAMETER);
+ );
}
@@ -1434,7 +1422,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
- ACE_ENV_ARG_DECL
+
)
{
@@ -1471,8 +1459,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
, exceptions
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ );
}
@@ -1487,7 +1474,7 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
TAO_ServerRequest & server_request,
void * /* servant_upcall */,
void * servant
- ACE_ENV_ARG_DECL
+
)
{
TAO_IFR_Client_Adapter *_tao_adapter =
@@ -1497,15 +1484,14 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
if (_tao_adapter == 0)
{
- ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
+ throw ( ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
CORBA::COMPLETED_NO));
}
POA_CORBA::ConstructionPolicy * const impl =
static_cast<POA_CORBA::ConstructionPolicy *> (servant);
CORBA::InterfaceDef_ptr _tao_retval =
- impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
+ impl->_get_interface ();
server_request.init_reply ();
TAO_OutputCDR &_tao_out = *server_request.outgoing ();
@@ -1520,7 +1506,7 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
if (_tao_result == 0)
{
- ACE_THROW (CORBA::MARSHAL ());
+ throw ::CORBA::MARSHAL ();
}
}
@@ -1545,7 +1531,7 @@ namespace POA_CORBA
{
}
- virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+ virtual void execute (void)
{
TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
@@ -1555,7 +1541,7 @@ namespace POA_CORBA
retval =
this->servant_-> _get_component (
- ACE_ENV_SINGLE_ARG_PARAMETER);
+ );
}
@@ -1570,7 +1556,7 @@ void POA_CORBA::ConstructionPolicy::_component_skel (
TAO_ServerRequest & server_request,
void * TAO_INTERCEPTOR (servant_upcall),
void * servant
- ACE_ENV_ARG_DECL
+
)
{
@@ -1607,14 +1593,13 @@ void POA_CORBA::ConstructionPolicy::_component_skel (
, exceptions
, nexceptions
#endif /* TAO_HAS_INTERCEPTORS == 1 */
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ );
}
CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a (
const char* value
- ACE_ENV_ARG_DECL_NOT_USED
+
)
{
return
@@ -1645,23 +1630,22 @@ const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const
void POA_CORBA::ConstructionPolicy::_dispatch (
TAO_ServerRequest & req,
void * servant_upcall
- ACE_ENV_ARG_DECL
+
)
{
this->synchronous_upcall_dispatch (req,
servant_upcall,
this
- ACE_ENV_ARG_PARAMETER);
+ );
}
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_ss.cpp:891
CORBA::ConstructionPolicy *
-POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ConstructionPolicy::_this (void)
{
- TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (0);
+ TAO_Stub *stub = this->_create_stub ();
TAO_Stub_Auto_Ptr safe_stub (stub);
CORBA::Object_ptr tmp = CORBA::Object::_nil ();
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index 0983a05f4fd..f8810004498 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -68,118 +68,110 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace POA_CORBA
{
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_sh.cpp:87
-
+
class DomainManager;
typedef DomainManager *DomainManager_ptr;
-
+
class _TAO_DomainManager_Direct_Proxy_Impl;
class _TAO_DomainManager_Strategized_Proxy_Broker;
-
+
class TAO_Domain_Export DomainManager
: public virtual PortableServer::ServantBase
{
protected:
DomainManager (void);
-
+
public:
// Useful for template programming.
typedef ::CORBA::DomainManager _stub_type;
typedef ::CORBA::DomainManager_ptr _stub_ptr_type;
typedef ::CORBA::DomainManager_var _stub_var_type;
-
+
DomainManager (const DomainManager& rhs);
virtual ~DomainManager (void);
-
+
virtual CORBA::Boolean _is_a (
const char* logical_type_id
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
-
+
static void _is_a_skel (
TAO_ServerRequest & req,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
);
-
+
static void _non_existent_skel (
TAO_ServerRequest & req,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
);
-
+
static void _interface_skel (
TAO_ServerRequest & req,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
);
-
+
static void _component_skel (
TAO_ServerRequest & req,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
);
-
+
virtual void _dispatch (
TAO_ServerRequest & req,
void * servant_upcall
- ACE_ENV_ARG_DECL
);
-
+
::CORBA::DomainManager *_this (
- ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+ void
);
-
+
virtual const char* _interface_repository_id (void) const;
-
+
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_sh.cpp:45
-
+
virtual ::CORBA::Policy_ptr get_domain_policy (
::CORBA::PolicyType policy_type
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((
CORBA::SystemException
)) = 0;
-
+
static void get_domain_policy_skel (
TAO_ServerRequest & server_request,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
);
};
-
+
///////////////////////////////////////////////////////////////////////
- // Strategized Proxy Broker Declaration
+ // Strategized Proxy Broker Declaration
//
-
+
// TAO_IDL - Generated from
// be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+
class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker
: public virtual TAO::Collocation_Proxy_Broker
{
- public:
+ public:
_TAO_DomainManager_Strategized_Proxy_Broker (void);
-
+
virtual ~_TAO_DomainManager_Strategized_Proxy_Broker (void);
-
+
TAO::Collocation_Strategy
get_strategy (
CORBA::Object_ptr obj
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((CORBA::SystemException));
-
+
void
dispatch (
CORBA::Object_ptr obj,
@@ -189,196 +181,195 @@ namespace POA_CORBA
const char * op,
size_t op_len,
TAO::Collocation_Strategy strategy
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((CORBA::Exception));
-
+
static _TAO_DomainManager_Strategized_Proxy_Broker *
the_TAO_DomainManager_Strategized_Proxy_Broker (void);
};
-
+
//
- // End Strategized Proxy Broker Declaration
+ // End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
-
-
- // TAO_IDL - Generated from
+
+
+
+ // TAO_IDL - Generated from
// be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+
///////////////////////////////////////////////////////////////////////
// Direct Impl. Declaration
//
-
+
class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl
{
public:
_TAO_DomainManager_Direct_Proxy_Impl (void);
-
+
virtual ~_TAO_DomainManager_Direct_Proxy_Impl (void) {}
-
+
// TAO_IDL - Generated from
// be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+
static void
get_domain_policy (
TAO_Abstract_ServantBase *servant,
TAO::Argument ** args,
int num_args
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
};
-
+
//
// Direct Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
-
-
+
+
+
// TAO_IDL - Generated from
// be\be_visitor_interface/interface_sh.cpp:87
-
+
class ConstructionPolicy;
typedef ConstructionPolicy *ConstructionPolicy_ptr;
-
+
class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
class _TAO_ConstructionPolicy_Strategized_Proxy_Broker;
-
+
class TAO_Domain_Export ConstructionPolicy
: public virtual POA_CORBA::Policy
{
protected:
ConstructionPolicy (void);
-
+
public:
// Useful for template programming.
typedef ::CORBA::ConstructionPolicy _stub_type;
typedef ::CORBA::ConstructionPolicy_ptr _stub_ptr_type;
typedef ::CORBA::ConstructionPolicy_var _stub_var_type;
-
+
ConstructionPolicy (const ConstructionPolicy& rhs);
virtual ~ConstructionPolicy (void);
-
+
virtual CORBA::Boolean _is_a (
const char* logical_type_id
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
);
-
+
static void _is_a_skel (
TAO_ServerRequest & req,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
+
);
-
+
static void _non_existent_skel (
TAO_ServerRequest & req,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
+
);
-
+
static void _interface_skel (
TAO_ServerRequest & req,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
+
);
-
+
static void _component_skel (
TAO_ServerRequest & req,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
+
);
-
+
virtual void _dispatch (
TAO_ServerRequest & req,
void * servant_upcall
- ACE_ENV_ARG_DECL
+
);
-
+
::CORBA::ConstructionPolicy *_this (
- ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+ void
);
-
+
virtual const char* _interface_repository_id (void) const;
-
+
// TAO_IDL - Generated from
// be\be_visitor_operation/operation_sh.cpp:45
-
+
virtual void make_domain_manager (
::CORBA::InterfaceDef_ptr object_type,
::CORBA::Boolean constr_policy
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((
CORBA::SystemException
)) = 0;
-
+
static void make_domain_manager_skel (
TAO_ServerRequest & server_request,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
+
);
-
+
static void
_get_policy_type_skel (
TAO_ServerRequest & server_request,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
);
-
+
// TAO_IDL - Generated from
// be\be_interface.cpp:1859
-
+
static void
copy_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
);
-
+
// TAO_IDL - Generated from
// be\be_interface.cpp:1859
-
+
static void
destroy_skel (
- TAO_ServerRequest & server_request,
+ TAO_ServerRequest & server_request,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
);
};
-
+
///////////////////////////////////////////////////////////////////////
- // Strategized Proxy Broker Declaration
+ // Strategized Proxy Broker Declaration
//
-
+
// TAO_IDL - Generated from
// be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+
class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker
: public virtual TAO::Collocation_Proxy_Broker
{
- public:
+ public:
_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-
+
virtual ~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
-
+
TAO::Collocation_Strategy
get_strategy (
CORBA::Object_ptr obj
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((CORBA::SystemException));
-
+
void
dispatch (
CORBA::Object_ptr obj,
@@ -388,99 +379,99 @@ namespace POA_CORBA
const char * op,
size_t op_len,
TAO::Collocation_Strategy strategy
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((CORBA::Exception));
-
+
static _TAO_ConstructionPolicy_Strategized_Proxy_Broker *
the_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
};
-
+
//
- // End Strategized Proxy Broker Declaration
+ // End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
-
-
- // TAO_IDL - Generated from
+
+
+
+ // TAO_IDL - Generated from
// be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
+
///////////////////////////////////////////////////////////////////////
// Direct Impl. Declaration
//
-
+
class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl
: public virtual ::POA_CORBA::_TAO_Policy_Direct_Proxy_Impl
{
public:
_TAO_ConstructionPolicy_Direct_Proxy_Impl (void);
-
+
virtual ~_TAO_ConstructionPolicy_Direct_Proxy_Impl (void) {}
-
+
// TAO_IDL - Generated from
// be\be_visitor_operation/proxy_impl_xh.cpp:24
-
+
static void
make_domain_manager (
TAO_Abstract_ServantBase *servant,
TAO::Argument ** args,
int num_args
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
));static void
_get_policy_type (
- TAO_Abstract_ServantBase *servant,
+ TAO_Abstract_ServantBase *servant,
TAO::Argument ** args,
int num_args
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
-
+
// TAO_IDL - Generated from
// be\be_interface.cpp:2050
-
+
static void
copy (
- TAO_Abstract_ServantBase *servant,
+ TAO_Abstract_ServantBase *servant,
TAO::Argument ** args,
int num_args
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
-
+
// TAO_IDL - Generated from
// be\be_interface.cpp:2050
-
+
static void
destroy (
- TAO_Abstract_ServantBase *servant,
+ TAO_Abstract_ServantBase *servant,
TAO::Argument ** args,
int num_args
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
};
-
+
//
// Direct Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
-
+
+
// TAO_IDL - Generated from
// be\be_visitor_module/module_sh.cpp:80
} // module CORBA
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_codegen.cpp:995
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl
index 5e1b77f1084..ac024975dee 100644
--- a/TAO/tao/Domain/DomainS.inl
+++ b/TAO/tao/Domain/DomainS.inl
@@ -33,7 +33,7 @@ POA_CORBA::ConstructionPolicy::_get_policy_type_skel (
TAO_ServerRequest & server_request,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
+
)
{
POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
@@ -41,7 +41,7 @@ POA_CORBA::ConstructionPolicy::_get_policy_type_skel (
server_request,
servant_upcall,
impl
- ACE_ENV_ARG_PARAMETER
+
);
}
@@ -54,7 +54,7 @@ POA_CORBA::ConstructionPolicy::copy_skel (
TAO_ServerRequest & server_request,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
+
)
{
POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
@@ -62,7 +62,7 @@ POA_CORBA::ConstructionPolicy::copy_skel (
server_request,
servant_upcall,
impl
- ACE_ENV_ARG_PARAMETER
+
);
}
@@ -75,7 +75,7 @@ POA_CORBA::ConstructionPolicy::destroy_skel (
TAO_ServerRequest & server_request,
void * servant_upcall,
void * servant
- ACE_ENV_ARG_DECL
+
)
{
POA_CORBA::Policy * const impl = static_cast<POA_CORBA::ConstructionPolicy *> (servant);
@@ -83,7 +83,7 @@ POA_CORBA::ConstructionPolicy::destroy_skel (
server_request,
servant_upcall,
impl
- ACE_ENV_ARG_PARAMETER
+
);
}
@@ -95,7 +95,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type (
TAO_Abstract_ServantBase *servant,
TAO::Argument ** args,
int num_args
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -105,7 +105,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type (
servant,
args,
num_args
- ACE_ENV_ARG_PARAMETER
+
);
}
@@ -118,7 +118,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy (
TAO_Abstract_ServantBase *servant,
TAO::Argument ** args,
int num_args
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -128,7 +128,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy (
servant,
args,
num_args
- ACE_ENV_ARG_PARAMETER
+
);
}
@@ -141,7 +141,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy (
TAO_Abstract_ServantBase *servant,
TAO::Argument ** args,
int num_args
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -151,7 +151,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy (
servant,
args,
num_args
- ACE_ENV_ARG_PARAMETER
+
);
}
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index 253698af938..02cdc148bbf 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -40,15 +40,15 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_root/root_sth.cpp:116
namespace POA_CORBA
{
-
+
// TAO_IDL - Generated from
// be\be_visitor_interface/tie_sh.cpp:87
-
+
// TIE class: Refer to CORBA v2.2, Section 20.34.4
template <class T>
class DomainManager_tie : public DomainManager
@@ -68,7 +68,7 @@ namespace POA_CORBA
// ctor with T*, ownership flag and a POA
~DomainManager_tie (void);
// dtor
-
+
// TIE specific functions
T *_tied_object (void);
// return the underlying object
@@ -80,36 +80,36 @@ namespace POA_CORBA
// do we own it
void _is_owner (CORBA::Boolean b);
// set the ownership
-
+
// overridden ServantBase operations
PortableServer::POA_ptr _default_POA (
- ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+ void
);
-
+
// TAO_IDL - Generated from
// be\be_visitor_operation/tie_sh.cpp:60
-
+
::CORBA::Policy_ptr get_domain_policy (
::CORBA::PolicyType policy_type
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
-
+
private:
T *ptr_;
PortableServer::POA_var poa_;
CORBA::Boolean rel_;
-
+
// copy and assignment are not allowed
DomainManager_tie (const DomainManager_tie &);
void operator= (const DomainManager_tie &);
};
-
+
// TAO_IDL - Generated from
// be\be_visitor_interface/tie_sh.cpp:87
-
+
// TIE class: Refer to CORBA v2.2, Section 20.34.4
template <class T>
class ConstructionPolicy_tie : public ConstructionPolicy
@@ -129,7 +129,7 @@ namespace POA_CORBA
// ctor with T*, ownership flag and a POA
~ConstructionPolicy_tie (void);
// dtor
-
+
// TIE specific functions
T *_tied_object (void);
// return the underlying object
@@ -141,66 +141,66 @@ namespace POA_CORBA
// do we own it
void _is_owner (CORBA::Boolean b);
// set the ownership
-
+
// overridden ServantBase operations
PortableServer::POA_ptr _default_POA (
- ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+ void
);
-
+
// TAO_IDL - Generated from
// be\be_visitor_operation/tie_sh.cpp:60
-
+
CORBA::PolicyType policy_type (
- ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+ void
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
-
+
// TAO_IDL - Generated from
// be\be_visitor_operation/tie_sh.cpp:60
-
+
::CORBA::Policy_ptr copy (
- ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+ void
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
-
+
// TAO_IDL - Generated from
// be\be_visitor_operation/tie_sh.cpp:60
-
+
void destroy (
- ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+ void
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
-
+
// TAO_IDL - Generated from
// be\be_visitor_operation/tie_sh.cpp:60
-
+
void make_domain_manager (
::CORBA::InterfaceDef_ptr object_type,
::CORBA::Boolean constr_policy
- ACE_ENV_ARG_DECL_WITH_DEFAULTS
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
-
+
private:
T *ptr_;
PortableServer::POA_var poa_;
CORBA::Boolean rel_;
-
+
// copy and assignment are not allowed
ConstructionPolicy_tie (const ConstructionPolicy_tie &);
void operator= (const ConstructionPolicy_tie &);
};
} // module CORBA
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_codegen.cpp:1096
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Domain/DomainS_T.inl b/TAO/tao/Domain/DomainS_T.inl
index 2287aa6ba7e..937efa3ed1a 100644
--- a/TAO/tao/Domain/DomainS_T.inl
+++ b/TAO/tao/Domain/DomainS_T.inl
@@ -81,7 +81,7 @@ POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -93,7 +93,7 @@ POA_CORBA::DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -111,23 +111,23 @@ POA_CORBA::DomainManager_tie<T>::_is_owner (CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::DomainManager_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::DomainManager_tie<T>::_default_POA (void)
{
if (!CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->DomainManager::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->DomainManager::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:68
template <class T> ACE_INLINE
::CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy (
::CORBA::PolicyType policy_type
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -135,7 +135,7 @@ template <class T> ACE_INLINE
{
return this->ptr_->get_domain_policy (
policy_type
- ACE_ENV_ARG_PARAMETER
+
);
}
@@ -192,7 +192,7 @@ POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj)
{
delete this->ptr_;
}
-
+
this->ptr_ = &obj;
this->rel_ = 0;
}
@@ -204,7 +204,7 @@ POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean relea
{
delete this->ptr_;
}
-
+
this->ptr_ = obj;
this->rel_ = release;
}
@@ -222,72 +222,72 @@ POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b)
}
template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
+POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (void)
{
if (!CORBA::is_nil (this->poa_.in ()))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
}
-
- return this->ConstructionPolicy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+ return this->ConstructionPolicy::_default_POA ();
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:68
template <class T> ACE_INLINE
CORBA::PolicyType POA_CORBA::ConstructionPolicy_tie<T>::policy_type (
- ACE_ENV_SINGLE_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
return this->ptr_->policy_type (
- ACE_ENV_SINGLE_ARG_PARAMETER
+
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:68
template <class T> ACE_INLINE
::CORBA::Policy_ptr POA_CORBA::ConstructionPolicy_tie<T>::copy (
- ACE_ENV_SINGLE_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
return this->ptr_->copy (
- ACE_ENV_SINGLE_ARG_PARAMETER
+
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:68
template <class T> ACE_INLINE
void POA_CORBA::ConstructionPolicy_tie<T>::destroy (
- ACE_ENV_SINGLE_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
this->ptr_->destroy (
- ACE_ENV_SINGLE_ARG_PARAMETER
+
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_operation/tie_si.cpp:68
template <class T> ACE_INLINE
void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager (
::CORBA::InterfaceDef_ptr object_type,
::CORBA::Boolean constr_policy
- ACE_ENV_ARG_DECL
+
)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -296,7 +296,7 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager (
this->ptr_->make_domain_manager (
object_type,
constr_policy
- ACE_ENV_ARG_PARAMETER
+
);
}
View Lorry Controller Status