From abebdd85e6aebcdfc9633c2df0050f0f56ef8215 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 30 Mar 2005 07:59:23 +0000 Subject: ChangeLogTag: Wed Mar 30 07:53:12 UTC 2005 Johnny Willemsen --- TAO/ChangeLog | 5 + TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp | 6 +- TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h | 6 +- .../orbsvcs/Notify/Notify_Constraint_Visitors.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h | 2 +- TAO/tao/Domain/DomainS.cpp | 294 ++++++++++----------- TAO/tao/RTScheduling/Request_Interceptor.cpp | 2 +- 7 files changed, 157 insertions(+), 160 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 37db2b3d5e3..edd93501dd1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 30 07:53:12 UTC 2005 Johnny Willemsen + + * tao/TypeCodeFactory_Adapter.h: + Corrected forward declarations + Tue Mar 29 15:46:12 UTC 2005 Johnny Willemsen * tao/Exception.{h,cpp}: diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp index 2a04884b7f0..7c2b01ba585 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp @@ -9,7 +9,7 @@ #include "tao/Managed_Types.h" #include "tao/Environment.h" #include "tao/CDR.h" -#include "tao/Typecode.h" +#include "tao/TypeCode.h" #if ! defined (__ACE_INLINE__) #include "ETCL_Constraint.inl" @@ -89,12 +89,12 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any) else if (corba_type == CORBA::tk_enum) { TAO::Any_Impl *impl = any->impl (); - + if (impl->encoded ()) { TAO::Unknown_IDL_Type *unk = dynamic_cast (impl); - + // We don't want unk's rd_ptr to move, in case we are shared by // another Any, so we use this to copy the state, not the buffer. TAO_InputCDR for_reading (unk->_tao_get_cdr ()); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h index 074e3538f10..ac3e4faa975 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -6,7 +6,7 @@ * * $Id$ * - * + * * * * @author Pradeep Gore @@ -29,7 +29,7 @@ #include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" #include "orbsvcs/DsLogAdminC.h" -#include "tao/Typecode.h" +#include "tao/TypeCode.h" #include "log_serv_export.h" @@ -109,7 +109,7 @@ private: TAO_SYNCH_MUTEX> HASH_MAP; typedef HASH_MAP::ENTRY HASH_ENTRY; - + /// Used to lookup property name and values. HASH_MAP property_lookup_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index 431da6aaa51..aa183f98f21 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -25,7 +25,7 @@ #include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h" #include "orbsvcs/CosNotificationC.h" -#include "tao/Typecode.h" +#include "tao/TypeCode.h" #include "notify_serv_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index fccf6b4491b..8d833bd8e8b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -18,7 +18,7 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" -#include "tao/Typecode.h" +#include "tao/TypeCode.h" #include "tao/CORBA_String.h" #include "tao/SystemException.h" diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index a099d52952b..248abdbf867 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -53,7 +53,7 @@ #include "tao/Stub.h" #include "tao/IFR_Client_Adapter.h" #include "tao/Object_T.h" -#include "tao/Typecode.h" +#include "tao/TypeCode.h" #include "tao/DynamicC.h" #include "tao/CDR.h" #include "tao/operation_details.h" @@ -336,7 +336,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:985 +// be\be_visitor_interface/interface_ss.cpp:999 TAO::Collocation_Proxy_Broker * CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -420,28 +420,18 @@ POA_CORBA::DomainManager::DomainManager (const DomainManager& rhs) POA_CORBA::DomainManager::~DomainManager (void) { } - -// TAO_IDL - Generated from -// be\be_visitor_operation/operation_ss.cpp:165 - -void POA_CORBA::DomainManager::get_domain_policy_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ACE_ENV_ARG_DECL - ) +namespace POA_CORBA { // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:74 + // be\be_visitor_operation/upcall_command_ss.cpp:127 - class Upcall_Command + class get_domain_policy_DomainManager : public TAO::Upcall_Command { public: - - inline Upcall_Command ( + inline get_domain_policy_DomainManager ( POA_CORBA::DomainManager * servant, TAO_Operation_Details const * operation_details, TAO::Argument * const args[]) @@ -473,12 +463,25 @@ void POA_CORBA::DomainManager::get_domain_policy_skel ( } private: - POA_CORBA::DomainManager * const servant_; TAO_Operation_Details const * const operation_details_; TAO::Argument * const * const args_; }; +} + + +// TAO_IDL - Generated from +// be\be_visitor_operation/operation_ss.cpp:192 + +void POA_CORBA::DomainManager::get_domain_policy_skel ( + TAO_ServerRequest & server_request, + void * TAO_INTERCEPTOR (servant_upcall), + void * servant + ACE_ENV_ARG_DECL + ) +{ + #if TAO_HAS_INTERCEPTORS == 1 static CORBA::TypeCode_ptr const * const exceptions = 0; @@ -497,10 +500,9 @@ void POA_CORBA::DomainManager::get_domain_policy_skel ( static size_t const nargs = 2; POA_CORBA::DomainManager * const impl = - static_cast< - POA_CORBA::DomainManager *> (servant); - - Upcall_Command command ( + static_cast (servant); + + get_domain_policy_DomainManager command ( impl, server_request.operation_details (), args); @@ -510,13 +512,11 @@ void POA_CORBA::DomainManager::get_domain_policy_skel ( , args , nargs , command - #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -525,24 +525,18 @@ void POA_CORBA::DomainManager::get_domain_policy_skel ( // TAO_IDL - Generated from // be\be_visitor_interface/interface_ss.cpp:169 -void POA_CORBA::DomainManager::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ACE_ENV_ARG_DECL - ) +namespace POA_CORBA { // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:74 + // be\be_visitor_operation/upcall_command_ss.cpp:127 - class Upcall_Command + class _is_a_DomainManager_Upcall_Command : public TAO::Upcall_Command { public: - - inline Upcall_Command ( + inline _is_a_DomainManager_Upcall_Command ( POA_CORBA::DomainManager * servant, TAO_Operation_Details const * operation_details, TAO::Argument * const args[]) @@ -574,12 +568,20 @@ void POA_CORBA::DomainManager::_is_a_skel ( } private: - POA_CORBA::DomainManager * const servant_; TAO_Operation_Details const * const operation_details_; TAO::Argument * const * const args_; }; +} +void POA_CORBA::DomainManager::_is_a_skel ( + TAO_ServerRequest & server_request, + void * TAO_INTERCEPTOR (servant_upcall), + void * servant + ACE_ENV_ARG_DECL + ) +{ + #if TAO_HAS_INTERCEPTORS == 1 static CORBA::TypeCode_ptr const * const exceptions = 0; @@ -598,10 +600,9 @@ void POA_CORBA::DomainManager::_is_a_skel ( static size_t const nargs = 2; POA_CORBA::DomainManager * const impl = - static_cast< - POA_CORBA::DomainManager *> (servant); + static_cast (servant); - Upcall_Command command ( + _is_a_DomainManager_Upcall_Command command ( impl, server_request.operation_details (), args); @@ -611,36 +612,28 @@ void POA_CORBA::DomainManager::_is_a_skel ( , args , nargs , command - #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); ACE_CHECK; } -void POA_CORBA::DomainManager::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ACE_ENV_ARG_DECL - ) +namespace POA_CORBA { // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:74 + // be\be_visitor_operation/upcall_command_ss.cpp:127 - class Upcall_Command + class _non_existent_DomainManager_Upcall_Command : public TAO::Upcall_Command { public: - - inline Upcall_Command ( + inline _non_existent_DomainManager_Upcall_Command ( POA_CORBA::DomainManager * servant, TAO_Operation_Details const * operation_details, TAO::Argument * const args[]) @@ -665,12 +658,20 @@ void POA_CORBA::DomainManager::_non_existent_skel ( } private: - POA_CORBA::DomainManager * const servant_; TAO_Operation_Details const * const operation_details_; TAO::Argument * const * const args_; }; +} +void POA_CORBA::DomainManager::_non_existent_skel ( + TAO_ServerRequest & server_request, + void * TAO_INTERCEPTOR (servant_upcall), + void * servant + ACE_ENV_ARG_DECL + ) +{ + #if TAO_HAS_INTERCEPTORS == 1 static CORBA::TypeCode_ptr const * const exceptions = 0; @@ -687,10 +688,9 @@ void POA_CORBA::DomainManager::_non_existent_skel ( static size_t const nargs = 1; POA_CORBA::DomainManager * const impl = - static_cast< - POA_CORBA::DomainManager *> (servant); + static_cast (servant); - Upcall_Command command ( + _non_existent_DomainManager_Upcall_Command command ( impl, server_request.operation_details (), args); @@ -700,13 +700,11 @@ void POA_CORBA::DomainManager::_non_existent_skel ( , args , nargs , command - #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -715,7 +713,7 @@ void POA_CORBA::DomainManager::_non_existent_skel ( // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:385 +// be\be_visitor_interface/interface_ss.cpp:393 @@ -738,8 +736,7 @@ void POA_CORBA::DomainManager::_interface_skel ( } POA_CORBA::DomainManager * const impl = - static_cast< - POA_CORBA::DomainManager *> (servant); + static_cast (servant); CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -761,24 +758,18 @@ void POA_CORBA::DomainManager::_interface_skel ( } } -void POA_CORBA::DomainManager::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ACE_ENV_ARG_DECL - ) +namespace POA_CORBA { // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:74 + // be\be_visitor_operation/upcall_command_ss.cpp:127 - class Upcall_Command + class _get_component_DomainManager_Upcall_Command : public TAO::Upcall_Command { public: - - inline Upcall_Command ( + inline _get_component_DomainManager_Upcall_Command ( POA_CORBA::DomainManager * servant, TAO_Operation_Details const * operation_details, TAO::Argument * const args[]) @@ -803,12 +794,20 @@ void POA_CORBA::DomainManager::_component_skel ( } private: - POA_CORBA::DomainManager * const servant_; TAO_Operation_Details const * const operation_details_; TAO::Argument * const * const args_; }; +} +void POA_CORBA::DomainManager::_component_skel ( + TAO_ServerRequest & server_request, + void * TAO_INTERCEPTOR (servant_upcall), + void * servant + ACE_ENV_ARG_DECL + ) +{ + #if TAO_HAS_INTERCEPTORS == 1 static CORBA::TypeCode_ptr const * const exceptions = 0; @@ -825,10 +824,9 @@ void POA_CORBA::DomainManager::_component_skel ( static size_t const nargs = 1; POA_CORBA::DomainManager * const impl = - static_cast< - POA_CORBA::DomainManager *> (servant); + static_cast (servant); - Upcall_Command command ( + _get_component_DomainManager_Upcall_Command command ( impl, server_request.operation_details (), args); @@ -838,13 +836,11 @@ void POA_CORBA::DomainManager::_component_skel ( , args , nargs , command - #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -874,7 +870,7 @@ const char* POA_CORBA::DomainManager::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:926 +// be\be_visitor_interface/interface_ss.cpp:940 void POA_CORBA::DomainManager::_dispatch ( TAO_ServerRequest & req, @@ -889,7 +885,7 @@ void POA_CORBA::DomainManager::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:877 +// be\be_visitor_interface/interface_ss.cpp:891 CORBA::DomainManager * POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -1105,7 +1101,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:985 +// be\be_visitor_interface/interface_ss.cpp:999 TAO::Collocation_Proxy_Broker * CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -1190,28 +1186,18 @@ POA_CORBA::ConstructionPolicy::ConstructionPolicy (const ConstructionPolicy& rhs POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void) { } - -// TAO_IDL - Generated from -// be\be_visitor_operation/operation_ss.cpp:165 - -void POA_CORBA::ConstructionPolicy::make_domain_manager_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ACE_ENV_ARG_DECL - ) +namespace POA_CORBA { // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:74 + // be\be_visitor_operation/upcall_command_ss.cpp:127 - class Upcall_Command + class make_domain_manager_ConstructionPolicy : public TAO::Upcall_Command { public: - - inline Upcall_Command ( + inline make_domain_manager_ConstructionPolicy ( POA_CORBA::ConstructionPolicy * servant, TAO_Operation_Details const * operation_details, TAO::Argument * const args[]) @@ -1243,12 +1229,25 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel ( } private: - POA_CORBA::ConstructionPolicy * const servant_; TAO_Operation_Details const * const operation_details_; TAO::Argument * const * const args_; }; +} + + +// TAO_IDL - Generated from +// be\be_visitor_operation/operation_ss.cpp:192 + +void POA_CORBA::ConstructionPolicy::make_domain_manager_skel ( + TAO_ServerRequest & server_request, + void * TAO_INTERCEPTOR (servant_upcall), + void * servant + ACE_ENV_ARG_DECL + ) +{ + #if TAO_HAS_INTERCEPTORS == 1 static CORBA::TypeCode_ptr const * const exceptions = 0; @@ -1269,10 +1268,9 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel ( static size_t const nargs = 3; POA_CORBA::ConstructionPolicy * const impl = - static_cast< - POA_CORBA::ConstructionPolicy *> (servant); - - Upcall_Command command ( + static_cast (servant); + + make_domain_manager_ConstructionPolicy command ( impl, server_request.operation_details (), args); @@ -1282,13 +1280,11 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel ( , args , nargs , command - #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -1297,24 +1293,18 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel ( // TAO_IDL - Generated from // be\be_visitor_interface/interface_ss.cpp:169 -void POA_CORBA::ConstructionPolicy::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ACE_ENV_ARG_DECL - ) +namespace POA_CORBA { // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:74 + // be\be_visitor_operation/upcall_command_ss.cpp:127 - class Upcall_Command + class _is_a_ConstructionPolicy_Upcall_Command : public TAO::Upcall_Command { public: - - inline Upcall_Command ( + inline _is_a_ConstructionPolicy_Upcall_Command ( POA_CORBA::ConstructionPolicy * servant, TAO_Operation_Details const * operation_details, TAO::Argument * const args[]) @@ -1346,12 +1336,20 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel ( } private: - POA_CORBA::ConstructionPolicy * const servant_; TAO_Operation_Details const * const operation_details_; TAO::Argument * const * const args_; }; +} +void POA_CORBA::ConstructionPolicy::_is_a_skel ( + TAO_ServerRequest & server_request, + void * TAO_INTERCEPTOR (servant_upcall), + void * servant + ACE_ENV_ARG_DECL + ) +{ + #if TAO_HAS_INTERCEPTORS == 1 static CORBA::TypeCode_ptr const * const exceptions = 0; @@ -1370,10 +1368,9 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel ( static size_t const nargs = 2; POA_CORBA::ConstructionPolicy * const impl = - static_cast< - POA_CORBA::ConstructionPolicy *> (servant); + static_cast (servant); - Upcall_Command command ( + _is_a_ConstructionPolicy_Upcall_Command command ( impl, server_request.operation_details (), args); @@ -1383,36 +1380,28 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel ( , args , nargs , command - #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); ACE_CHECK; } -void POA_CORBA::ConstructionPolicy::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ACE_ENV_ARG_DECL - ) +namespace POA_CORBA { // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:74 + // be\be_visitor_operation/upcall_command_ss.cpp:127 - class Upcall_Command + class _non_existent_ConstructionPolicy_Upcall_Command : public TAO::Upcall_Command { public: - - inline Upcall_Command ( + inline _non_existent_ConstructionPolicy_Upcall_Command ( POA_CORBA::ConstructionPolicy * servant, TAO_Operation_Details const * operation_details, TAO::Argument * const args[]) @@ -1437,12 +1426,20 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel ( } private: - POA_CORBA::ConstructionPolicy * const servant_; TAO_Operation_Details const * const operation_details_; TAO::Argument * const * const args_; }; +} +void POA_CORBA::ConstructionPolicy::_non_existent_skel ( + TAO_ServerRequest & server_request, + void * TAO_INTERCEPTOR (servant_upcall), + void * servant + ACE_ENV_ARG_DECL + ) +{ + #if TAO_HAS_INTERCEPTORS == 1 static CORBA::TypeCode_ptr const * const exceptions = 0; @@ -1459,10 +1456,9 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel ( static size_t const nargs = 1; POA_CORBA::ConstructionPolicy * const impl = - static_cast< - POA_CORBA::ConstructionPolicy *> (servant); + static_cast (servant); - Upcall_Command command ( + _non_existent_ConstructionPolicy_Upcall_Command command ( impl, server_request.operation_details (), args); @@ -1472,13 +1468,11 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel ( , args , nargs , command - #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -1487,7 +1481,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel ( // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:385 +// be\be_visitor_interface/interface_ss.cpp:393 @@ -1510,8 +1504,7 @@ void POA_CORBA::ConstructionPolicy::_interface_skel ( } POA_CORBA::ConstructionPolicy * const impl = - static_cast< - POA_CORBA::ConstructionPolicy *> (servant); + static_cast (servant); CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -1533,24 +1526,18 @@ void POA_CORBA::ConstructionPolicy::_interface_skel ( } } -void POA_CORBA::ConstructionPolicy::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ACE_ENV_ARG_DECL - ) +namespace POA_CORBA { // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:74 + // be\be_visitor_operation/upcall_command_ss.cpp:127 - class Upcall_Command + class _get_component_ConstructionPolicy_Upcall_Command : public TAO::Upcall_Command { public: - - inline Upcall_Command ( + inline _get_component_ConstructionPolicy_Upcall_Command ( POA_CORBA::ConstructionPolicy * servant, TAO_Operation_Details const * operation_details, TAO::Argument * const args[]) @@ -1575,12 +1562,20 @@ void POA_CORBA::ConstructionPolicy::_component_skel ( } private: - POA_CORBA::ConstructionPolicy * const servant_; TAO_Operation_Details const * const operation_details_; TAO::Argument * const * const args_; }; +} +void POA_CORBA::ConstructionPolicy::_component_skel ( + TAO_ServerRequest & server_request, + void * TAO_INTERCEPTOR (servant_upcall), + void * servant + ACE_ENV_ARG_DECL + ) +{ + #if TAO_HAS_INTERCEPTORS == 1 static CORBA::TypeCode_ptr const * const exceptions = 0; @@ -1597,10 +1592,9 @@ void POA_CORBA::ConstructionPolicy::_component_skel ( static size_t const nargs = 1; POA_CORBA::ConstructionPolicy * const impl = - static_cast< - POA_CORBA::ConstructionPolicy *> (servant); + static_cast (servant); - Upcall_Command command ( + _get_component_ConstructionPolicy_Upcall_Command command ( impl, server_request.operation_details (), args); @@ -1610,13 +1604,11 @@ void POA_CORBA::ConstructionPolicy::_component_skel ( , args , nargs , command - #if TAO_HAS_INTERCEPTORS == 1 , servant_upcall , exceptions , nexceptions #endif /* TAO_HAS_INTERCEPTORS == 1 */ - ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -1650,7 +1642,7 @@ const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:926 +// be\be_visitor_interface/interface_ss.cpp:940 void POA_CORBA::ConstructionPolicy::_dispatch ( TAO_ServerRequest & req, @@ -1665,7 +1657,7 @@ void POA_CORBA::ConstructionPolicy::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:877 +// be\be_visitor_interface/interface_ss.cpp:891 CORBA::ConstructionPolicy * POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL) diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index 0caa243e2be..fd4d749c7fe 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -6,7 +6,7 @@ #include "tao/TSS_Resources.h" #include "tao/debug.h" #include "tao/Any.h" -#include "tao/Typecode.h" +#include "tao/TypeCode.h" #include "tao/ORB_Constants.h" #include "ace/OS_NS_string.h" -- cgit v1.2.1