diff options
Diffstat (limited to 'TAO/orbsvcs')
169 files changed, 3741 insertions, 3522 deletions
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h index 133b1c752e8..1949fe51117 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h @@ -27,7 +27,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Log_Msg.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "orbsvcs/Concurrency/Concurrency_Utils.h" #include "orbsvcs/Naming/Naming_Server.h" diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc index 1287013fe4b..896ea1a4f60 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, concurrency, naming_serv { +project : orbsvcsexe, core, concurrency, naming_serv, utils { exename = Concurrency_Service } diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index b0e7514c829..ee22bd331d4 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -407,7 +407,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( )); ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -473,7 +473,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( ACE_THROW (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -1035,7 +1035,7 @@ TAO::FT_ReplicationManager::create_object ( PortableGroup::GenericFactory::FactoryCreationId, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index 566eec1207a..3a49f16968c 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -16,7 +16,7 @@ #ifndef IFR_SERVICE_H #define IFR_SERVICE_H -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" #include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "tao/ORB.h" @@ -24,43 +24,43 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +/** + * @class IFR_Service + * + * A class that initializes, runs and shuts down + * the Interface Repository service. + */ class IFR_Service { - // = TITLE - // IFR_Service - // - // = DESCRIPTION - // A class that initializes, runs and shuts down - // the Interface Repository service. public: + /// Default constructor. IFR_Service (void); - // Default constructor. + /// Destructor ~IFR_Service (void); - // Destructor + /// Initialize the IFR service. int init (int argc, char *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS); - // Initialize the IFR service. + /// Shut down the IFR Service. int fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - // Shut down the IFR Service. - + + /// Run the IFR service. int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - // Run the IFR service. protected: - + + /// Reference to our ORB. CORBA::ORB_var orb_; - // Reference to our ORB. + /// Root POA reference. PortableServer::POA_var root_poa_; - // Root POA reference. + /// IFR Server instance. TAO_IFR_Server my_ifr_server_; - // IFR Server instance. }; #endif /* IFR_SERVICE_H */ diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h index f629595b5c3..8e2d0ed52f3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h @@ -14,7 +14,9 @@ #ifndef IMR_ADAPTER_ACTIVATOR_H #define IMR_ADAPTER_ACTIVATOR_H -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/AdapterActivatorC.h" +#include "tao/PortableServer/ServantLocatorC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp index 73d9ad0c420..afb2d49cf3e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp @@ -18,7 +18,8 @@ #include "tao/Object_KeyC.h" #include "tao/ORB_Constants.h" -#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/POA_Current.h" +#include "tao/PortableServer/POA_Current_Impl.h" /** * This constructor takes in orb and ImR_Locator_i pointers to store for later @@ -84,7 +85,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, ACE_TRY_CHECK; ACE_CString ior = pior.in(); - + // Check that the returned ior is the expected partial ior with // missing ObjectKey. if (ior.find("corbaloc:") != 0 || ior[ior.length() - 1] != '/') @@ -94,17 +95,18 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &, CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0), CORBA::COMPLETED_NO)); } - + CORBA::String_var key_str; // Unlike POA Current, this implementation cannot be cached. - TAO_POA_Current* tao_current = - dynamic_cast<TAO_POA_Current*> (this->poa_current_var_.in ()); + TAO::Portable_Server::POA_Current* tao_current = + dynamic_cast <TAO::Portable_Server::POA_Current*> (this->poa_current_var_.in ()); + ACE_ASSERT(tao_current != 0); - TAO_POA_Current_Impl* impl = tao_current->implementation (); + TAO::Portable_Server::POA_Current_Impl* impl = tao_current->implementation (); TAO::ObjectKey::encode_sequence_to_string (key_str.out(), impl->object_key ()); - + ior += key_str.in(); - + forward_obj = this->orb_->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h index 2236f1cf7ff..ef5a8f2a8b6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h @@ -15,7 +15,9 @@ #ifndef IMR_FORWARDER_H #define IMR_FORWARDER_H -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/ServantLocatorC.h" +#include "tao/PortableServer/PS_CurrentC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl index b3886b8952e..c3e333d3f57 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl @@ -2,7 +2,7 @@ // $Id$ -#include "tao/PortableServer/ImplRepo.pidl" +#include "tao/ImR_Client/ImplRepo.pidl" module ImplementationRepository { diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 1a59d3efab3..6cadc6e7623 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -7,7 +7,7 @@ #include "orbsvcs/Time_Utilities.h" #include "tao/IORTable/IORTable.h" -#include "tao/PortableServer/POA.h" +#include "tao/PortableServer/PortableServer.h" #include "tao/ORB_Core.h" #include "tao/default_ports.h" #include "tao/Messaging/Messaging.h" @@ -393,7 +393,7 @@ ACE_THROW_SPEC ((CORBA::SystemException, { info.reset(); } - + while(true) { if (is_alive(info)) @@ -636,7 +636,7 @@ ImR_Locator_i::register_server_i (const char* server, server, info->activator.c_str())); ACE_THROW (ImplementationRepository::AlreadyRegistered()); } - + if (this->debug_ > 0) ACE_DEBUG((LM_DEBUG, "ImR Locator: Updating server <%s>.\n", server)); @@ -821,7 +821,7 @@ ImR_Locator_i::server_is_running (const char* name, // allocated on the heap here, but is deleted within the // handle_timeout() call. Status_Changed_Timer* sct; - ACE_NEW_THROW_EX (sct, + ACE_NEW_THROW_EX (sct, Status_Changed_Timer (this, info), CORBA::NO_MEMORY ()); @@ -1109,7 +1109,7 @@ ImR_Locator_i::is_alive(Server_Info& info) // This is evil, but there's not much else we can do for now. We should never // reach this code once the ImR Servers are fixed so that they don't lie about // server_is_running. Currently, they send this notification during poa creation. - // We have to run the orb, because the very thing that may be slowing the + // We have to run the orb, because the very thing that may be slowing the // aliveness of the servers is the fact that they're trying to register more // objects with us. ACE_Time_Value tv = IS_ALIVE_RETRY_INTERVAL; diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index 30218651d5b..75d9ac4a2c6 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -1,6 +1,6 @@ // $Id$ -project(ImR_Activator_IDL) : orbsvcslib, portableserver, messaging { +project(ImR_Activator_IDL) : orbsvcslib, portableserver, messaging, imr_client { sharedname = TAO_ImR_Activator_IDL dynamicflags = ACTIVATOR_IDL_BUILD_DLL idlflags += -GH -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h @@ -16,7 +16,7 @@ project(ImR_Activator_IDL) : orbsvcslib, portableserver, messaging { } } -project(ImR_Locator_IDL) : orbsvcslib, valuetype, portableserver { +project(ImR_Locator_IDL) : orbsvcslib, valuetype, portableserver, imr_client { sharedname = TAO_ImR_Locator_IDL after += ImR_Activator_IDL libs += TAO_ImR_Activator_IDL @@ -37,7 +37,7 @@ project(ImR_Locator_IDL) : orbsvcslib, valuetype, portableserver { } } -project(ImR_Activator) : orbsvcslib, core, acexml, minimum_corba, valuetype, portableserver { +project(ImR_Activator) : orbsvcslib, core, acexml, minimum_corba, valuetype, portableserver, imr_client { sharedname = TAO_ImR_Activator dynamicflags = ACTIVATOR_BUILD_DLL after += ImR_Activator_IDL ImR_Locator_IDL @@ -57,7 +57,7 @@ project(ImR_Activator) : orbsvcslib, core, acexml, minimum_corba, valuetype, por } } -project(ImR_Locator) : orbsvcslib, core, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml { +project(ImR_Locator) : orbsvcslib, core, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml, imr_client { sharedname = TAO_ImR_Locator dynamicflags = LOCATOR_BUILD_DLL after += ImR_Locator_IDL ImR_Activator_IDL @@ -83,7 +83,7 @@ project(ImR_Locator) : orbsvcslib, core, minimum_corba, iortable, portableserver } } -project(ImR_Locator_Service) : orbsvcsexe, core, minimum_corba, iortable, messaging, acexml ,svc_utils { +project(ImR_Locator_Service) : orbsvcsexe, core, minimum_corba, iortable, messaging, acexml ,svc_utils, imr_client { exename = ImplRepo_Service after += ImR_Locator ImR_Activator_IDL ImR_Locator_IDL libs += TAO_ImR_Locator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL @@ -106,7 +106,7 @@ project(ImR_Locator_Service) : orbsvcsexe, core, minimum_corba, iortable, messag } -project(ImR_Activator_Service) : orbsvcsexe, core, acexml, minimum_corba, messaging, svc_utils { +project(ImR_Activator_Service) : orbsvcsexe, core, acexml, minimum_corba, messaging, svc_utils, imr_client { exename = ImR_Activator after += ImR_Activator ImR_Activator_IDL ImR_Locator_IDL libs += TAO_ImR_Activator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL @@ -119,7 +119,7 @@ project(ImR_Activator_Service) : orbsvcsexe, core, acexml, minimum_corba, messag } -project(tao_imr) : orbsvcsexe, core, minimum_corba, portableserver { +project(tao_imr) : orbsvcsexe, core, minimum_corba, portableserver, imr_client { exename = tao_imr install = $(ACE_ROOT)/bin Source_Files { diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h index 40059bcd58f..9a8dc019eae 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h @@ -15,8 +15,8 @@ #define IMR_ITERATOR_H #include "Locator_Repository.h" -#include "tao/PortableServer/PortableServerC.h" -#include "tao/PortableServer/ImplRepoS.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/ImR_Client/ImplRepoS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h index b6e451d9419..9380e364774 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h +++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h @@ -15,7 +15,7 @@ #include "ace/Bound_Ptr.h" -#include "tao/PortableServer/ImplRepoC.h" +#include "tao/ImR_Client/ImplRepoC.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 99da29e20cd..c55ea3fe38c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -2,7 +2,8 @@ #include "tao_imr_i.h" -#include "tao/PortableServer/POA.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/ForwardRequestC.h" #include "tao/Stub.h" #include "tao/Profile.h" diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h index 10573eeda31..f2fe1710355 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h @@ -15,7 +15,7 @@ #ifndef TAO_IMR_I_H #define TAO_IMR_I_H -#include "tao/PortableServer/ImplRepoC.h" +#include "tao/ImR_Client/ImplRepoC.h" #include "tao/corba.h" #include "ace/SString.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/orbsvcs/ImplRepo_Service/utils.h b/TAO/orbsvcs/ImplRepo_Service/utils.h index 8007c51902a..cf28b14fb75 100644 --- a/TAO/orbsvcs/ImplRepo_Service/utils.h +++ b/TAO/orbsvcs/ImplRepo_Service/utils.h @@ -2,7 +2,7 @@ #ifndef TAO_IMR_UTILS_H #define TAO_IMR_UTILS_H -#include "tao/PortableServer/ImplRepoC.h" +#include "tao/ImR_Client/ImplRepoC.h" #include "ace/SString.h" @@ -12,7 +12,7 @@ class ImR_Utils { public: - static ACE_CString activationModeToString(ImplementationRepository::ActivationMode mode) + static ACE_CString activationModeToString(ImplementationRepository::ActivationMode mode) { switch (mode ) { @@ -29,7 +29,7 @@ public: return ""; } } - static ImplementationRepository::ActivationMode parseActivationMode(const ACE_CString& s) + static ImplementationRepository::ActivationMode parseActivationMode(const ACE_CString& s) { if (s == "NORMAL") return ImplementationRepository::NORMAL; @@ -42,10 +42,10 @@ public: return ImplementationRepository::NORMAL; } - static ACE_CString envListToString(const ImplementationRepository::EnvironmentList& lst) + static ACE_CString envListToString(const ImplementationRepository::EnvironmentList& lst) { ACE_CString ret; - for (CORBA::ULong n = 0; n < lst.length(); ++n) + for (CORBA::ULong n = 0; n < lst.length(); ++n) { ret += "name=\""; ret += lst[n].name.in(); @@ -55,7 +55,7 @@ public: } return ret; } - static ImplementationRepository::EnvironmentList parseEnvList(const ACE_CString& s) + static ImplementationRepository::EnvironmentList parseEnvList(const ACE_CString& s) { ImplementationRepository::EnvironmentList ret(10); @@ -64,17 +64,17 @@ public: const ACE_CString ENDTAG = "\""; ssize_t i = 0; - + for (CORBA::ULong idx = 0; ; ++idx) { - // find name + // find name ssize_t j = s.find(NAMETAG, i); if (j == ACE_CString::npos) break; j += NAMETAG.length(); ssize_t k = s.find(ENDTAG, j + 1); if (k == ACE_CString::npos) break; ACE_CString name = s.substr(j, k - j); - + i = k + 1; // find value diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h index 636b1d99d03..35355e5368e 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "LifeCycle_Service_i.h" #ifndef LIFECYCLE_SERVICE_H diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc index 1375457f260..06eccfc1104 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, lifecycle, naming, trading_serv, minimum_corba { +project : orbsvcsexe, core, lifecycle, naming, trading_serv, minimum_corba, utils { exename = LifeCycle_Service } diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp index f501af2db29..0c5d929232c 100644 --- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp +++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp @@ -166,7 +166,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) TAO_LB_LoadManager, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h index 8d7e65db10a..5e9e7c2dea2 100644 --- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h +++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h @@ -21,10 +21,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/ORB.h" -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" #include "ace/Signal.h" - /** * @class TAO_LB_Signal_Handler * @@ -98,5 +97,4 @@ private: }; - #endif /* TAO_LB_SIGNAL_HANDLER_H */ diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h index b2326ebabab..2ad9cb1f7dd 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h @@ -20,7 +20,6 @@ #ifndef TAO_NAMING_SERVICE_H #define TAO_NAMING_SERVICE_H -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/Naming/Naming_Server.h" class TAO_Naming_Service diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h index e76f5c63b15..3ffa5426945 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h @@ -25,7 +25,7 @@ #ifndef TAO_SCHEDULING_SERVICE_H #define TAO_SCHEDULING_SERVICE_H -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "orbsvcs/Sched/Reconfig_Scheduler.h" #if defined (TAO_USES_STRATEGY_SCHEDULER) #include "orbsvcs/Sched/Strategy_Scheduler.h" diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc index 425c601b15d..d960fa1d23f 100644 --- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc +++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc @@ -1,6 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, rtsched, naming, svc_utils, iortable, portableserver { +project : orbsvcsexe, core, rtsched, naming, svc_utils, iortable, portableserver, utils { exename = Scheduling_Service } diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h index 78d4d7c61b0..30d226c8c15 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.h +++ b/TAO/orbsvcs/Time_Service/Clerk_i.h @@ -19,7 +19,7 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Server.h" #include "orbsvcs/Time/TAO_Time_Service_Clerk.h" diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h index 70660377faf..2e9505f5399 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.h +++ b/TAO/orbsvcs/Time_Service/Server_i.h @@ -19,7 +19,7 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Server.h" #include "orbsvcs/Time/TAO_Time_Service_Server.h" diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc index 865cc01d9fc..f084b72995d 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service.mpc +++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv { +project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv, utils { exename = Time_Service_Server Source_Files { Server_i.cpp @@ -9,7 +9,7 @@ project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv { } } -project(Time_Service_Clerk) : orbsvcsexe, core, time, naming_serv { +project(Time_Service_Clerk) : orbsvcsexe, core, time, naming_serv, utils { exename = Time_Service_Clerk Source_Files { Clerk_i.cpp diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h index 55f5073f798..f793fc7b1d7 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.h +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h @@ -16,7 +16,6 @@ #ifndef _TRADING_SERVICE_H #define _TRADING_SERVICE_H -#include "tao/PortableServer/ORB_Manager.h" #include "ace/Auto_Ptr.h" #include "ace/Signal.h" diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc index 46950125c54..884c05caf01 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, core, naming, trading_serv { +project : orbsvcsexe, core, naming, trading_serv, utils { exename = Trading_Service } diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp index 7c9a7013075..2a7399a364d 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp @@ -40,7 +40,7 @@ ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info ReplicaController (orb.in ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index ece15d8bcb8..bdd9174ad5c 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -471,7 +471,7 @@ namespace FT::FTRequestServiceContext, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp index 8883013b75d..f6239df905c 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp @@ -37,7 +37,7 @@ ORBInitializer::post_init ( ServerRequestInterceptor, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -54,7 +54,7 @@ ORBInitializer::post_init ( TAO_LB_ServerRequestInterceptor (this->load_alert_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp index 7a089b04d7e..431ebd7622f 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp @@ -39,7 +39,7 @@ RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::Location (this->location_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -69,7 +69,7 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::LoadList (1), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -79,7 +79,7 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) load_list->length (1); load_list[0].id = CosLoadBalancing::RequestsPerSecond; - + // VC 7.1 gives a warning without an explicit cast. load_list[0].value = static_cast<CORBA::Float> (request_count / elapsed_time.msec () * 1000); diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h index 3d8adbae1d5..e2da612d297 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h @@ -18,9 +18,10 @@ #define GATEWAY_I_H #include "tao/DynamicInterface/DII_CORBA_methods.h" -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" #include "tao/DynamicInterface/Dynamic_Implementation.h" #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h" +#include "tao/PortableServer/PS_CurrentC.h" class Gateway_i : public virtual PortableServer::DynamicImplementation diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp index 20ec718076c..32c4e9ce579 100644 --- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Object_Factory_i.h" -#include "tao/PortableServer/POA.h" +#include "tao/PortableServer/Root_POA.h" Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr gateway_poa) diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp index 471b38d8515..93fd158c07b 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp @@ -46,7 +46,7 @@ Server_IORInterceptor_ORBInitializer::post_init ( Server_IORInterceptor (gateway_object_factory.in ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index fc1dacd3ec2..4c223b52763 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -28,7 +28,6 @@ #include "ace/Svc_Handler.h" #include "ace/SOCK_Acceptor.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/AV/AV_export.h" #include "orbsvcs/CosPropertyServiceS.h" #include "orbsvcs/AVStreamsS.h" @@ -45,9 +44,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(push) # pragma warning (disable : 4250) #endif /* _MSC_VER */ @@ -1547,7 +1544,7 @@ public: #include "Flows_T.h" -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index 0288bb565b3..61a55dd05d5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -17,11 +17,11 @@ #include /**/ "ace/pre.h" #include "AVStreams_i.h" -#include "tao/PortableServer/ORB_Manager.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined (_MSC_VER) +# pragma warning(push) # pragma warning (disable : 4250) #endif /* _MSC_VER */ @@ -174,5 +174,9 @@ protected: // Include the templates here. #include "Endpoint_Strategy_T.h" +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + #include /**/ "ace/post.h" #endif /* TAO_AV_ENDPOINT_STRATEGY_H */ diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index 997aed079b2..9886212697f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -9,7 +9,6 @@ #include "tao/debug.h" -#include "tao/PortableServer/ORB_Manager.h" #include "ace/OS_NS_strings.h" #if !defined (__ACE_INLINE__) @@ -37,7 +36,7 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void) local_sec_addr_ (0), num_local_sec_addrs_ (0), peer_sec_addr_ (0), - num_peer_sec_addrs_ (0), + num_peer_sec_addrs_ (0), peer_control_addr_ (0), local_addr_ (0), local_control_addr_ (0), @@ -77,7 +76,7 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (const char *flowname, local_sec_addr_ (0), num_local_sec_addrs_ (0), peer_sec_addr_ (0), - num_peer_sec_addrs_ (0), + num_peer_sec_addrs_ (0), peer_control_addr_ (0), local_addr_ (0), local_control_addr_ (0), @@ -117,7 +116,7 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (const char *flowname, local_sec_addr_ (0), num_local_sec_addrs_ (0), peer_sec_addr_ (0), - num_peer_sec_addrs_ (0), + num_peer_sec_addrs_ (0), peer_control_addr_ (0), local_addr_ (0), local_control_addr_ (0), @@ -243,11 +242,11 @@ TAO_FlowSpec_Entry::parse_address (const char *address, TAO_Tokenizer protocol_tokenizer (address,'='); this->carrier_protocol_ = protocol_tokenizer[0]; - + int result = this->set_protocol (); if (result < 0) return result; - + if (protocol_tokenizer [1] != 0) { ACE_DEBUG ((LM_DEBUG, @@ -260,11 +259,11 @@ TAO_FlowSpec_Entry::parse_address (const char *address, if (this->protocol_ == TAO_AV_Core::TAO_AV_SCTP_SEQ) { TAO_Tokenizer addr_token (protocol_tokenizer [1], ';'); - + ACE_DEBUG ((LM_DEBUG, "Number of local sec addresses = %d\n", addr_token.num_tokens () - 1)); - + if (addr_token.num_tokens () != 0) { addr += addr_token [0]; @@ -281,7 +280,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, } } else addr += protocol_tokenizer[1]; - + switch (this->protocol_) { @@ -355,7 +354,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, if (this->protocol_ == TAO_AV_Core::TAO_AV_SCTP_SEQ) { - + ACE_DEBUG ((LM_DEBUG, "Number of local sec addresses = %d\n", port_tokenizer.num_tokens () - 1)); @@ -554,35 +553,35 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) if (tokenizer [TAO_AV_PEER_ADDR] != 0) { ACE_INET_Addr *addr = 0; - - + + if (this->protocol_ == TAO_AV_Core::TAO_AV_SCTP_SEQ) { TAO_Tokenizer addr_token (tokenizer [TAO_AV_PEER_ADDR], ';'); - + ACE_DEBUG ((LM_DEBUG, "Number of peer sec addresses = %d\n", addr_token.num_tokens () - 1)); - + if (addr_token.num_tokens () != 0) { ACE_NEW_RETURN (addr, ACE_INET_Addr (addr_token [0]), 0); - + ACE_NEW_RETURN (peer_sec_addr_, char* [addr_token.num_tokens () - 1],-1); for (int j = 1; j <= addr_token.num_tokens () - 1; j++) { ACE_DEBUG ((LM_DEBUG, "adding addresses to sequence %s\n", addr_token [j])); - + peer_sec_addr_ [j-1] = CORBA::string_dup (addr_token [j]); } num_peer_sec_addrs_ = addr_token.num_tokens () - 1; } } - else + else { ACE_NEW_RETURN (addr, ACE_INET_Addr (tokenizer [TAO_AV_PEER_ADDR]), @@ -595,13 +594,13 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) ACE_DEBUG ((LM_DEBUG, "Peer Address %s \n", buf)); - - } + + } if (tokenizer [TAO_AV_FLOW_PROTOCOL] != 0) if (this->parse_flow_protocol_string (tokenizer [TAO_AV_FLOW_PROTOCOL]) < 0) return -1; - + return 0; } @@ -629,7 +628,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) { if (this->flowname_.length() == 0) return ""; - + char address [BUFSIZ]; ACE_CString address_str; ACE_CString peer_address_str; @@ -671,7 +670,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) address_str += this->local_sec_addr_ [i]; } } - + } else { @@ -733,7 +732,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->peer_addr_); inet_addr->addr_to_string (address,BUFSIZ); //inet_addr->get_host_name (address, BUFSIZ); - + //cstring += ACE_OS::itoa (address, BUFSIZ, inet_addr->get_port_number ()); } @@ -747,7 +746,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) //peer_address_str = this->carrier_protocol_; //peer_address_str += "="; peer_address_str += cstring; - + if (this->protocol_ == TAO_AV_Core::TAO_AV_SCTP_SEQ) { for (int i = 0; i < this->num_peer_sec_addrs_; i++) @@ -800,7 +799,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) this->entry_ += this->flow_protocol_; this->entry_ += "\\"; this->entry_ += address_str; - + if (this->peer_addr_ != 0) { this->entry_ += "\\"; @@ -808,8 +807,8 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) } else ACE_DEBUG ((LM_DEBUG, "No peer address specified\n")); - - if (TAO_debug_level > 0) + + if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"Forward entry_to_string: entry = %s\n",this->entry_.c_str())); return this->entry_.c_str(); @@ -892,7 +891,7 @@ TAO_Reverse_FlowSpec_Entry::parse (const char *flowSpec_entry) ACE_DEBUG ((LM_DEBUG, "TAO_Reverse_FlowSpec_Entry::parse %s\n", flowSpec_entry)); - + if (tokenizer [TAO_AV_ADDRESS] != 0) if (this->parse_address (tokenizer [TAO_AV_ADDRESS], TAO_AV_Core::TAO_AV_BOTH) < 0) return -1; diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h index 24fd3082914..222e50afd51 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h @@ -17,7 +17,10 @@ #include /**/ "ace/pre.h" #include "ace/Addr.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Basic_Types.h" +#include "tao/CORBA_String.h" +#include "tao/Sequence_T.h" +#include "ace/Time_Value.h" #include "orbsvcs/AV/AV_export.h" struct TAO_AV_frame_info @@ -93,6 +96,7 @@ protected: typedef TAO_Unbounded_Sequence<TAO_AV_Policy*> TAO_AV_PolicyList; +class ACE_Message_Block; class TAO_AV_Protocol_Object; class TAO_AV_Transport; class TAO_AV_Flow_Handler; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h index 5f25b3fffd2..791fb2bce44 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h @@ -21,8 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PortableServerC.h" #include "orbsvcs/CosEvent/event_serv_export.h" +#include "tao/PortableServer/PortableServer.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushSupplier; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 8ca9427e19e..ddd191c302a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -12,8 +12,8 @@ #include "ace/OS_NS_errno.h" -ACE_RCSID (CosEvent, - CEC_Dispatching, +ACE_RCSID (CosEvent, + CEC_Dispatching, "$Id$") int @@ -70,7 +70,7 @@ TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy, void* buf = this->allocator_->malloc (sizeof (TAO_CEC_Push_Command)); if (buf == 0) - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_Message_Block *mb = @@ -93,7 +93,7 @@ TAO_CEC_Dispatching_Task::invoke (TAO_CEC_ProxyPushSupplier *proxy, void* buf = this->allocator_->malloc (sizeof (TAO_CEC_Invoke_Command)); if (buf == 0) - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_Message_Block *mb = diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h index 242c3cd2172..3463ad99f74 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h @@ -26,10 +26,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PortableServerC.h" #include "tao/Objref_VarOut_T.h" #include "orbsvcs/CosEvent/event_serv_export.h" +#include "tao/PortableServer/PortableServer.h" class TAO_CEC_EventChannel; class TAO_CEC_ProxyPushConsumer; diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index e77afbb200c..86dbc908354 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosTrading) : orbsvcslib, core { +project(CosTrading) : orbsvcslib, core, utils { sharedname = TAO_CosTrading dynamicflags = TAO_TRADING_BUILD_DLL @@ -93,7 +93,7 @@ project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver { } -project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils { +project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils, utils { sharedname = TAO_CosTrading_Serv dynamicflags = TAO_TRADING_SERV_BUILD_DLL tagchecks += Trader diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index db1d0cef034..ec794142b7e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -10,8 +10,8 @@ #include "EC_Dispatching_Task.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Event, - EC_Dispatching, +ACE_RCSID (Event, + EC_Dispatching, "$Id$") int @@ -77,7 +77,7 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy, void* buf = this->allocator_->malloc (sizeof (TAO_EC_Push_Command)); if (buf == 0) - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_Message_Block *mb = diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index 69654539cc9..9cb09930bc6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -9,8 +9,8 @@ #include "EC_Filter.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Event, - EC_Filter, +ACE_RCSID (Event, + EC_Filter, "$Id$") TAO_EC_Filter::~TAO_EC_Filter (void) @@ -46,7 +46,7 @@ TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info ACE_ENV_ARG_DECL) { ACE_UNUSED_ARG (qos_info); - ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO)); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 2ad2a374996..9d1d284ef0a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -18,8 +18,8 @@ #include "EC_Kokyu_Dispatching.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Event, - EC_Kokyu_Dispatching, +ACE_RCSID (Event, + EC_Kokyu_Dispatching, "$Id$") TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope) @@ -44,7 +44,7 @@ TAO_EC_Kokyu_Dispatching::activate (void) { if (!lanes_setup_) setup_lanes (); - + this->dispatcher_->activate (); //ACE_DEBUG ((LM_DEBUG, "Kokyu dispatcher activated\n")); @@ -94,7 +94,7 @@ TAO_EC_Kokyu_Dispatching::setup_lanes (void) attrs.sched_scope (disp_sched_scope_); // Create Kokyu::Dispatcher using factory - Kokyu::Dispatcher_Auto_Ptr + Kokyu::Dispatcher_Auto_Ptr tmp(Kokyu::Dispatcher_Factory::create_dispatcher(attrs)); this->dispatcher_ = tmp; this->lanes_setup_ = 1; @@ -128,12 +128,12 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, { if (this->dispatcher_.get () == 0) this->setup_lanes (); - - void* buf = + + void* buf = this->allocator_->malloc (sizeof (TAO_EC_Kokyu_Push_Command )); if (buf == 0) - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); // Create Dispatch_Command @@ -141,16 +141,16 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, new (buf) TAO_EC_Kokyu_Push_Command (proxy, consumer, event, this->allocator_); - - /* + + /* TAO_EC_Kokyu_Push_Command *cmd = new TAO_EC_Kokyu_Push_Command (proxy, consumer, event, 0); */ - + // Convert TAO_EC_QOS_Info to QoSDescriptor - RtecScheduler::RT_Info *rt_info = + RtecScheduler::RT_Info *rt_info = this->scheduler_->get(qos_info.rt_info); Kokyu::QoSDescriptor qosd; @@ -158,7 +158,7 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, qosd.deadline_ = rt_info->period; ORBSVCS_Time::TimeT_to_Time_Value (qosd.execution_time_, rt_info->worst_case_execution_time); - + this->dispatcher_->dispatch(cmd,qosd); } @@ -188,7 +188,7 @@ TAO_EC_Kokyu_Push_Command::execute () ACE_TRY { - //ACE_DEBUG ((LM_DEBUG, + //ACE_DEBUG ((LM_DEBUG, // "(%t) Command object executed.\n")); this->proxy_->push_to_consumer (this->consumer_.in (), diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h index 8efb85c2d98..f9c0006b629 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h @@ -19,7 +19,7 @@ #include /**/ "event_export.h" #include "orbsvcs/RtecEventChannelAdminC.h" -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp index c59cd08d228..270378879cc 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp @@ -12,7 +12,7 @@ ACE_RCSID (FaultTolerance, FT_ClientORBInitializer, "$Id$") - + void TAO_FT_ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -59,7 +59,7 @@ TAO_FT_ClientORBInitializer::register_policy_factories ( TAO_FT_ClientPolicyFactory, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index 532b838dd79..822749dc676 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -37,7 +37,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val TAO_FT_Request_Duration_Policy *tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (value), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -60,7 +60,7 @@ TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) { TAO_FT_Request_Duration_Policy* tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -122,7 +122,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val TAO_FT_Heart_Beat_Policy (value->heartbeat, value->heartbeat_interval, value->heartbeat_timeout), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -144,7 +144,7 @@ TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) { TAO_FT_Heart_Beat_Policy * tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index dfe0a842ff7..799d3cdff6a 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -155,7 +155,7 @@ namespace TAO if (!(icdr.read_string (rep_id.out ()) && icdr.read_ulong (min) && icdr.read_ulong (cs))) - ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::MARSHAL (TAO::VMCID, CORBA::COMPLETED_MAYBE)); cs = CORBA::CompletionStatus (cs); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp index fb692cfe234..1060bbacfba 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp @@ -62,7 +62,7 @@ TAO_FT_ORBInitializer::register_policy_factories ( TAO_FT_PolicyFactory, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp index 75b0e06d821..a99cc55c052 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp @@ -35,7 +35,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val TAO_FT_Request_Duration_Policy *tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (value), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -58,7 +58,7 @@ TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) { TAO_FT_Request_Duration_Policy* tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -120,7 +120,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val TAO_FT_Heart_Beat_Policy (value->heartbeat, value->heartbeat_interval, value->heartbeat_timeout), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -142,7 +142,7 @@ TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) { TAO_FT_Heart_Beat_Policy * tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -209,7 +209,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val TAO_FT_Heart_Beat_Enabled_Policy *tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (value), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -230,7 +230,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) { TAO_FT_Heart_Beat_Enabled_Policy * tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp index 728f608a449..1696f69d90e 100755 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp @@ -56,7 +56,7 @@ TAO_FT_ServerORBInitializer::register_policy_factories ( TAO_FT_ServerPolicyFactory, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp index 3a6aae1b42a..4c4608608c9 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp @@ -32,7 +32,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val TAO_FT_Heart_Beat_Enabled_Policy *tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (value), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -53,7 +53,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) { TAO_FT_Heart_Beat_Enabled_Policy * tmp; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index 792633f19a1..0b3ad78e22e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -169,7 +169,7 @@ namespace TAO { ACE_THROW (CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index b347f95660d..d5cdd436cb0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -61,7 +61,7 @@ namespace TAO_FTRT { FTRT_ClientORB_Initializer(transaction_depth), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h index 5cb5792d3c1..7dd61ba8316 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h @@ -14,7 +14,7 @@ #define AMI_REPLICATION_STRATEGY_H #include "ace/Task.h" -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" #include "orbsvcs/FTRT_GroupManagerC.h" #include "Replication_Strategy.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index 2c54702549e..1e010ee35df 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -14,7 +14,7 @@ #define GROUPINFOPUBLISHER_H #include "orbsvcs/FtRtecEventChannelAdminC.h" -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" #include "ace/Vector_T.h" #include "ace/Singleton.h" #include "ace/Synch.h" diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index 77d43f4d398..b835b0e4ab6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -4,6 +4,7 @@ #include "Update_Manager.h" #include "AMI_Primary_Replication_Strategy.h" #include "../Utils/resolve_init.h" +#include "tao/PortableServer/PS_CurrentC.h" ACE_RCSID (EventChannel, UpdateableHandler, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h index 9de80b870c4..875ac649b29 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h @@ -11,7 +11,7 @@ //============================================================================= #ifndef CREATE_PERSISTENT_POA_H #define CREATE_PERSISTENT_POA_H -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index ad2fba0b0f3..9db2b2cb14b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -4,6 +4,7 @@ #include "resolve_init.h" #include "orbsvcs/FtRtecEventCommS.h" #include "tao/ORB_Core.h" +#include "tao/PortableServer/PS_CurrentC.h" ACE_RCSID (Utils, FTEC_Gateway, @@ -144,7 +145,7 @@ FTEC_Gateway::FTEC_Gateway(CORBA::ORB_ptr orb, FtRtecEventChannelAdmin::EventCha : impl_(new FTEC_Gateway_Impl) { impl_->local_orb = CORBA::is_nil(orb); - if (!impl_->local_orb) + if (!impl_->local_orb) impl_->orb = CORBA::ORB::_duplicate(orb); impl_->ftec = FtRtecEventChannelAdmin::EventChannel::_duplicate(ftec); } @@ -291,7 +292,7 @@ void FTEC_Gateway::push(RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy_consu const RtecEventComm::EventSet & data ACE_ENV_ARG_DECL) { - PortableServer::ObjectId_var object_id = + PortableServer::ObjectId_var object_id = impl_->poa->reference_to_id(proxy_consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; FtRtecEventComm::ObjectId** result; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index 4dc6c541936..3876219be61 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -366,7 +366,7 @@ TAO::HTIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) TAO::HTIOP::Profile (this->orb_core ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 5d6e1cf94dc..6cc0c041d50 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -125,7 +125,7 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior // No object key delimiter or no hostname specified. ACE_THROW (CORBA::INV_OBJREF (CORBA::SystemException::_tao_minor_code - (TAO_DEFAULT_MINOR_CODE, + (TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -140,7 +140,7 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior // No hostname specified! It is required by the spec. ACE_THROW (CORBA::INV_OBJREF (CORBA::SystemException::_tao_minor_code - (TAO_DEFAULT_MINOR_CODE, + (TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -194,7 +194,7 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior // @@ What's the right exception to throw here? ACE_THROW (CORBA::INV_OBJREF (CORBA::SystemException::_tao_minor_code - (TAO_DEFAULT_MINOR_CODE, + (TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp index 1bf55e161f7..e4a78651efe 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp @@ -29,12 +29,13 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:609 -#ifndef _TAO_IDL_SERVER_IFR_BASES_CPP_ -#define _TAO_IDL_SERVER_IFR_BASES_CPP_ +#ifndef _TAO_IDL_ORIG_IFR_BASES_CPP_ +#define _TAO_IDL_ORIG_IFR_BASES_CPP_ #include "IFR_BaseS.h" -#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/ForwardRequestC.h" #include "tao/PortableServer/Operation_Table.h" #include "tao/TAO_Server_Request.h" #include "tao/ORB_Core.h" @@ -71,20 +72,20 @@ #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 { // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:574 + // be\be_visitor_arg_traits.cpp:624 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_) #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::DefinitionKind> + class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind> : public Basic_Arg_Traits_T< CORBA::DefinitionKind @@ -112,13 +113,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:612 + // be\be_visitor_arg_traits.cpp:662 #if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_SS_) #define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::Contained::Description> + class TAO_IFR_Client_Export Arg_Traits<CORBA::Contained::Description> : public Var_Size_Arg_Traits_T< CORBA::Contained::Description, @@ -165,13 +166,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_SS_) #define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::Container::DescriptionSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::Container::DescriptionSeq> : public Var_Size_Arg_Traits_T< CORBA::Container::DescriptionSeq, @@ -320,13 +321,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::InterfaceDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq> : public Var_Size_Arg_Traits_T< CORBA::InterfaceDefSeq, @@ -390,13 +391,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ValueDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq> : public Var_Size_Arg_Traits_T< CORBA::ValueDefSeq, @@ -443,13 +444,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::AbstractInterfaceDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::AbstractInterfaceDefSeq> : public Var_Size_Arg_Traits_T< CORBA::AbstractInterfaceDefSeq, @@ -496,13 +497,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_SS_) #define _CORBA_CONTAINEDSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ContainedSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ContainedSeq> : public Var_Size_Arg_Traits_T< CORBA::ContainedSeq, @@ -515,13 +516,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_) #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::StructMemberSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::StructMemberSeq> : public Var_Size_Arg_Traits_T< CORBA::StructMemberSeq, @@ -534,13 +535,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_) #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::InitializerSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq> : public Var_Size_Arg_Traits_T< CORBA::InitializerSeq, @@ -553,13 +554,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_) #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ExtInitializerSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq> : public Var_Size_Arg_Traits_T< CORBA::ExtInitializerSeq, @@ -572,13 +573,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_) #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::UnionMemberSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionMemberSeq> : public Var_Size_Arg_Traits_T< CORBA::UnionMemberSeq, @@ -591,13 +592,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_) #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::EnumMemberSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumMemberSeq> : public Var_Size_Arg_Traits_T< CORBA::EnumMemberSeq, @@ -625,7 +626,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_IRObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -737,7 +738,7 @@ class TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::IRObject *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -790,7 +791,7 @@ private: TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::IRObject *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -880,7 +881,7 @@ class TAO_ServerRequestInfo_CORBA_IRObject_destroy : public TAO_ServerRequestInf public: TAO_ServerRequestInfo_CORBA_IRObject_destroy ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::IRObject *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -930,7 +931,7 @@ private: TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::IRObject *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -1055,7 +1056,7 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -1125,7 +1126,7 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_IRObject_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -1256,9 +1257,9 @@ void POA_CORBA::IRObject::_get_def_kind_skel ( ::CORBA::DefinitionKind _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -1391,9 +1392,9 @@ void POA_CORBA::IRObject::destroy_skel ( #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -1501,7 +1502,7 @@ void POA_CORBA::IRObject::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::IRObject *_tao_impl = - (POA_CORBA::IRObject *) _tao_servant; + static_cast<POA_CORBA::IRObject *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -1531,7 +1532,7 @@ void POA_CORBA::IRObject::_non_existent_skel ( ) { POA_CORBA::IRObject *_tao_impl = - (POA_CORBA::IRObject *) _tao_servant; + static_cast<POA_CORBA::IRObject *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1564,7 +1565,7 @@ void POA_CORBA::IRObject::_interface_skel ( } POA_CORBA::IRObject *_tao_impl = - (POA_CORBA::IRObject *) _tao_servant; + static_cast<POA_CORBA::IRObject *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1595,7 +1596,7 @@ void POA_CORBA::IRObject::_component_skel ( ) { POA_CORBA::IRObject *_tao_impl = - (POA_CORBA::IRObject *) _tao_object_reference; + static_cast<POA_CORBA::IRObject *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1615,23 +1616,17 @@ CORBA::Boolean POA_CORBA::IRObject::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::IRObject::_downcast ( @@ -1659,7 +1654,7 @@ const char* POA_CORBA::IRObject::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::IRObject::_dispatch ( TAO_ServerRequest &req, @@ -1674,7 +1669,7 @@ void POA_CORBA::IRObject::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::IRObject * POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -1685,22 +1680,14 @@ POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -1727,7 +1714,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_Contained_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -1870,7 +1857,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_id_get : public TAO_ServerRequestInf public: TAO_ServerRequestInfo_CORBA_Contained_id_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -1923,7 +1910,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_id_get::TAO_ServerRequestInfo_CORBA_Contained_id_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -2013,7 +2000,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_id_set : public TAO_ServerRequestInf public: TAO_ServerRequestInfo_CORBA_Contained_id_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl, const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2065,7 +2052,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contained_id_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl, const char * id ACE_ENV_ARG_DECL_NOT_USED @@ -2154,7 +2141,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_name_get : public TAO_ServerRequestI public: TAO_ServerRequestInfo_CORBA_Contained_name_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -2207,7 +2194,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_name_get::TAO_ServerRequestInfo_CORBA_Contained_name_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -2297,7 +2284,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_name_set : public TAO_ServerRequestI public: TAO_ServerRequestInfo_CORBA_Contained_name_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl, const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2349,7 +2336,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Contained_name_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl, const char * name ACE_ENV_ARG_DECL_NOT_USED @@ -2438,7 +2425,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_version_get : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_Contained_version_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -2491,7 +2478,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_version_get::TAO_ServerRequestInfo_CORBA_Contained_version_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -2581,7 +2568,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_version_set : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_Contained_version_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl, const char * version ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2633,7 +2620,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_Contained_version_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl, const char * version ACE_ENV_ARG_DECL_NOT_USED @@ -2722,7 +2709,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_defined_in_get : public TAO_ServerRe public: TAO_ServerRequestInfo_CORBA_Contained_defined_in_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -2775,7 +2762,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::TAO_ServerRequestInfo_CORBA_Contained_defined_in_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -2865,7 +2852,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get : public TAO_Serve public: TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -2918,7 +2905,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -3008,7 +2995,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get : public T public: TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -3061,7 +3048,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -3151,7 +3138,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_describe : public TAO_ServerRequestI public: TAO_ServerRequestInfo_CORBA_Contained_describe ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -3204,7 +3191,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_describe::TAO_ServerRequestInfo_CORBA_Contained_describe ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -3294,7 +3281,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_move : public TAO_ServerRequestInfo public: TAO_ServerRequestInfo_CORBA_Contained_move ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Contained *tao_impl, ::CORBA::Container_ptr new_container, const char * new_name, @@ -3350,7 +3337,7 @@ private: TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Contained_move ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Contained *tao_impl, ::CORBA::Container_ptr new_container, const char * new_name, @@ -3497,7 +3484,7 @@ POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -3567,7 +3554,7 @@ POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_Contained_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -3936,9 +3923,9 @@ void POA_CORBA::Contained::_get_id_skel ( CORBA::String_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -4082,9 +4069,9 @@ void POA_CORBA::Contained::_set_id_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -4200,9 +4187,9 @@ void POA_CORBA::Contained::_get_name_skel ( CORBA::String_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -4346,9 +4333,9 @@ void POA_CORBA::Contained::_set_name_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -4464,9 +4451,9 @@ void POA_CORBA::Contained::_get_version_skel ( CORBA::String_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -4610,9 +4597,9 @@ void POA_CORBA::Contained::_set_version_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -4728,9 +4715,9 @@ void POA_CORBA::Contained::_get_defined_in_skel ( ::CORBA::Container_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -4863,9 +4850,9 @@ void POA_CORBA::Contained::_get_absolute_name_skel ( CORBA::String_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -4998,9 +4985,9 @@ void POA_CORBA::Contained::_get_containing_repository_skel ( ::CORBA::Repository_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -5133,9 +5120,9 @@ void POA_CORBA::Contained::describe_skel ( ::CORBA::Contained::Description_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -5283,9 +5270,9 @@ void POA_CORBA::Contained::move_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -5404,7 +5391,7 @@ void POA_CORBA::Contained::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::Contained *_tao_impl = - (POA_CORBA::Contained *) _tao_servant; + static_cast<POA_CORBA::Contained *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -5434,7 +5421,7 @@ void POA_CORBA::Contained::_non_existent_skel ( ) { POA_CORBA::Contained *_tao_impl = - (POA_CORBA::Contained *) _tao_servant; + static_cast<POA_CORBA::Contained *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -5467,7 +5454,7 @@ void POA_CORBA::Contained::_interface_skel ( } POA_CORBA::Contained *_tao_impl = - (POA_CORBA::Contained *) _tao_servant; + static_cast<POA_CORBA::Contained *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -5498,7 +5485,7 @@ void POA_CORBA::Contained::_component_skel ( ) { POA_CORBA::Contained *_tao_impl = - (POA_CORBA::Contained *) _tao_object_reference; + static_cast<POA_CORBA::Contained *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -5518,27 +5505,21 @@ CORBA::Boolean POA_CORBA::Contained::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::Contained::_downcast ( @@ -5572,7 +5553,7 @@ const char* POA_CORBA::Contained::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::Contained::_dispatch ( TAO_ServerRequest &req, @@ -5587,7 +5568,7 @@ void POA_CORBA::Contained::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::Contained * POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -5598,22 +5579,14 @@ POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -5640,7 +5613,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -5790,7 +5763,7 @@ class TAO_ServerRequestInfo_CORBA_Container_lookup : public TAO_ServerRequestInf public: TAO_ServerRequestInfo_CORBA_Container_lookup ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * search_name ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -5845,7 +5818,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Container_lookup ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * search_name ACE_ENV_ARG_DECL_NOT_USED @@ -5945,7 +5918,7 @@ class TAO_ServerRequestInfo_CORBA_Container_contents : public TAO_ServerRequestI public: TAO_ServerRequestInfo_CORBA_Container_contents ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, ::CORBA::DefinitionKind & limit_type, const ::CORBA::Boolean & exclude_inherited @@ -6002,7 +5975,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Container_contents ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, ::CORBA::DefinitionKind & limit_type, const ::CORBA::Boolean & exclude_inherited @@ -6108,7 +6081,7 @@ class TAO_ServerRequestInfo_CORBA_Container_lookup_name : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_Container_lookup_name ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * search_name, const ::CORBA::Long & levels_to_search, @@ -6169,7 +6142,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_Container_lookup_name ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * search_name, const ::CORBA::Long & levels_to_search, @@ -6287,7 +6260,7 @@ class TAO_ServerRequestInfo_CORBA_Container_describe_contents : public TAO_Serve public: TAO_ServerRequestInfo_CORBA_Container_describe_contents ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, ::CORBA::DefinitionKind & limit_type, const ::CORBA::Boolean & exclude_inherited, @@ -6346,7 +6319,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_CORBA_Container_describe_contents ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, ::CORBA::DefinitionKind & limit_type, const ::CORBA::Boolean & exclude_inherited, @@ -6458,7 +6431,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_module : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_Container_create_module ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -6517,7 +6490,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA_Container_create_module ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -6629,7 +6602,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_constant : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_Container_create_constant ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -6692,7 +6665,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_CORBA_Container_create_constant ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -6816,7 +6789,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_struct : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_Container_create_struct ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -6877,7 +6850,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA_Container_create_struct ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -6995,7 +6968,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_union : public TAO_ServerRequ public: TAO_ServerRequestInfo_CORBA_Container_create_union ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -7058,7 +7031,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_Container_create_union ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -7182,7 +7155,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_enum : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_Container_create_enum ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -7243,7 +7216,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_Container_create_enum ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -7361,7 +7334,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_alias : public TAO_ServerRequ public: TAO_ServerRequestInfo_CORBA_Container_create_alias ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -7422,7 +7395,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_Container_create_alias ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -7540,7 +7513,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_interface : public TAO_Server public: TAO_ServerRequestInfo_CORBA_Container_create_interface ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -7601,7 +7574,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CORBA_Container_create_interface ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -7719,7 +7692,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_value : public TAO_ServerRequ public: TAO_ServerRequestInfo_CORBA_Container_create_value ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -7792,7 +7765,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_Container_create_value ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -7946,7 +7919,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_value_box : public TAO_Server public: TAO_ServerRequestInfo_CORBA_Container_create_value_box ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8007,7 +7980,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CORBA_Container_create_value_box ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8125,7 +8098,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_exception : public TAO_Server public: TAO_ServerRequestInfo_CORBA_Container_create_exception ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8186,7 +8159,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CORBA_Container_create_exception ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8304,7 +8277,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_native : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_Container_create_native ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8363,7 +8336,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA_Container_create_native ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8475,7 +8448,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface : public T public: TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8536,7 +8509,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8654,7 +8627,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_local_interface : public TAO_ public: TAO_ServerRequestInfo_CORBA_Container_create_local_interface ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8715,7 +8688,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestInfo_CORBA_Container_create_local_interface ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8833,7 +8806,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_ext_value : public TAO_Server public: TAO_ServerRequestInfo_CORBA_Container_create_ext_value ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -8906,7 +8879,7 @@ private: TAO_ServerRequestInfo_CORBA_Container_create_ext_value::TAO_ServerRequestInfo_CORBA_Container_create_ext_value ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Container *tao_impl, const char * id, const char * name, @@ -9106,7 +9079,7 @@ POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -9176,7 +9149,7 @@ POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -9813,9 +9786,9 @@ void POA_CORBA::Container::lookup_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9963,9 +9936,9 @@ void POA_CORBA::Container::contents_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10121,9 +10094,9 @@ void POA_CORBA::Container::lookup_name_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10285,9 +10258,9 @@ void POA_CORBA::Container::describe_contents_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10445,9 +10418,9 @@ void POA_CORBA::Container::create_module_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10609,9 +10582,9 @@ void POA_CORBA::Container::create_constant_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10779,9 +10752,9 @@ void POA_CORBA::Container::create_struct_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10947,9 +10920,9 @@ void POA_CORBA::Container::create_union_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -11117,9 +11090,9 @@ void POA_CORBA::Container::create_enum_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -11283,9 +11256,9 @@ void POA_CORBA::Container::create_alias_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -11449,9 +11422,9 @@ void POA_CORBA::Container::create_interface_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -11627,9 +11600,9 @@ void POA_CORBA::Container::create_value_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -11817,9 +11790,9 @@ void POA_CORBA::Container::create_value_box_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -11983,9 +11956,9 @@ void POA_CORBA::Container::create_exception_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12147,9 +12120,9 @@ void POA_CORBA::Container::create_native_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12309,9 +12282,9 @@ void POA_CORBA::Container::create_abstract_interface_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12475,9 +12448,9 @@ void POA_CORBA::Container::create_local_interface_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12653,9 +12626,9 @@ void POA_CORBA::Container::create_ext_value_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12822,7 +12795,7 @@ void POA_CORBA::Container::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::Container *_tao_impl = - (POA_CORBA::Container *) _tao_servant; + static_cast<POA_CORBA::Container *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -12852,7 +12825,7 @@ void POA_CORBA::Container::_non_existent_skel ( ) { POA_CORBA::Container *_tao_impl = - (POA_CORBA::Container *) _tao_servant; + static_cast<POA_CORBA::Container *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12885,7 +12858,7 @@ void POA_CORBA::Container::_interface_skel ( } POA_CORBA::Container *_tao_impl = - (POA_CORBA::Container *) _tao_servant; + static_cast<POA_CORBA::Container *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12916,7 +12889,7 @@ void POA_CORBA::Container::_component_skel ( ) { POA_CORBA::Container *_tao_impl = - (POA_CORBA::Container *) _tao_object_reference; + static_cast<POA_CORBA::Container *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12936,27 +12909,21 @@ CORBA::Boolean POA_CORBA::Container::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::Container::_downcast ( @@ -12990,7 +12957,7 @@ const char* POA_CORBA::Container::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::Container::_dispatch ( TAO_ServerRequest &req, @@ -13005,7 +12972,7 @@ void POA_CORBA::Container::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::Container * POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -13016,22 +12983,14 @@ POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -13058,7 +13017,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_IDLType_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -13170,7 +13129,7 @@ class TAO_ServerRequestInfo_CORBA_IDLType_type_get : public TAO_ServerRequestInf public: TAO_ServerRequestInfo_CORBA_IDLType_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::IDLType *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -13223,7 +13182,7 @@ private: TAO_ServerRequestInfo_CORBA_IDLType_type_get::TAO_ServerRequestInfo_CORBA_IDLType_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::IDLType *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -13359,7 +13318,7 @@ POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -13429,7 +13388,7 @@ POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -13536,9 +13495,9 @@ void POA_CORBA::IDLType::_get_type_skel ( CORBA::TypeCode_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -13666,7 +13625,7 @@ void POA_CORBA::IDLType::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::IDLType *_tao_impl = - (POA_CORBA::IDLType *) _tao_servant; + static_cast<POA_CORBA::IDLType *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -13696,7 +13655,7 @@ void POA_CORBA::IDLType::_non_existent_skel ( ) { POA_CORBA::IDLType *_tao_impl = - (POA_CORBA::IDLType *) _tao_servant; + static_cast<POA_CORBA::IDLType *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -13729,7 +13688,7 @@ void POA_CORBA::IDLType::_interface_skel ( } POA_CORBA::IDLType *_tao_impl = - (POA_CORBA::IDLType *) _tao_servant; + static_cast<POA_CORBA::IDLType *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -13760,7 +13719,7 @@ void POA_CORBA::IDLType::_component_skel ( ) { POA_CORBA::IDLType *_tao_impl = - (POA_CORBA::IDLType *) _tao_object_reference; + static_cast<POA_CORBA::IDLType *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -13780,27 +13739,21 @@ CORBA::Boolean POA_CORBA::IDLType::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::IDLType::_downcast ( @@ -13834,7 +13787,7 @@ const char* POA_CORBA::IDLType::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::IDLType::_dispatch ( TAO_ServerRequest &req, @@ -13849,7 +13802,7 @@ void POA_CORBA::IDLType::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::IDLType * POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -13860,22 +13813,14 @@ POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -13902,7 +13847,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -14092,7 +14037,7 @@ POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -14162,7 +14107,7 @@ POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -14240,7 +14185,7 @@ void POA_CORBA::TypedefDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::TypedefDef *_tao_impl = - (POA_CORBA::TypedefDef *) _tao_servant; + static_cast<POA_CORBA::TypedefDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -14270,7 +14215,7 @@ void POA_CORBA::TypedefDef::_non_existent_skel ( ) { POA_CORBA::TypedefDef *_tao_impl = - (POA_CORBA::TypedefDef *) _tao_servant; + static_cast<POA_CORBA::TypedefDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14303,7 +14248,7 @@ void POA_CORBA::TypedefDef::_interface_skel ( } POA_CORBA::TypedefDef *_tao_impl = - (POA_CORBA::TypedefDef *) _tao_servant; + static_cast<POA_CORBA::TypedefDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14334,7 +14279,7 @@ void POA_CORBA::TypedefDef::_component_skel ( ) { POA_CORBA::TypedefDef *_tao_impl = - (POA_CORBA::TypedefDef *) _tao_object_reference; + static_cast<POA_CORBA::TypedefDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14354,35 +14299,29 @@ CORBA::Boolean POA_CORBA::TypedefDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/TypedefDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::TypedefDef::_downcast ( @@ -14428,7 +14367,7 @@ const char* POA_CORBA::TypedefDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::TypedefDef::_dispatch ( TAO_ServerRequest &req, @@ -14443,7 +14382,7 @@ void POA_CORBA::TypedefDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::TypedefDef * POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -14454,22 +14393,14 @@ POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h index fd936e5a547..8cecc4049b1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:390 -#ifndef _TAO_IDL_SERVER_IFR_BASES_H_ -#define _TAO_IDL_SERVER_IFR_BASES_H_ +#ifndef _TAO_IDL_ORIG_IFR_BASES_H_ +#define _TAO_IDL_ORIG_IFR_BASES_H_ #include /**/ "ace/pre.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp index 6c9a79646d5..1a5fed2264d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:683 -#ifndef _TAO_IDL_SERVER_IFR_BASES_T_CPP_ -#define _TAO_IDL_SERVER_IFR_BASES_T_CPP_ +#ifndef _TAO_IDL_ORIG_IFR_BASES_T_CPP_ +#define _TAO_IDL_ORIG_IFR_BASES_T_CPP_ #include "IFR_BaseS_T.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h index dcff2ee6c2e..c4b36f6d65a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:546 -#ifndef _TAO_IDL_SERVER_IFR_BASES_T_H_ -#define _TAO_IDL_SERVER_IFR_BASES_T_H_ +#ifndef _TAO_IDL_ORIG_IFR_BASES_T_H_ +#define _TAO_IDL_ORIG_IFR_BASES_T_H_ #include /**/ "ace/pre.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp index 2e72c40c80b..790fd216975 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp @@ -29,12 +29,13 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:609 -#ifndef _TAO_IDL_SERVER_IFR_BASICS_CPP_ -#define _TAO_IDL_SERVER_IFR_BASICS_CPP_ +#ifndef _TAO_IDL_ORIG_IFR_BASICS_CPP_ +#define _TAO_IDL_ORIG_IFR_BASICS_CPP_ #include "IFR_BasicS.h" -#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/ForwardRequestC.h" #include "tao/PortableServer/Operation_Table.h" #include "tao/TAO_Server_Request.h" #include "tao/ORB_Core.h" @@ -71,20 +72,20 @@ #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 { // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:574 + // be\be_visitor_arg_traits.cpp:624 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_) #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::DefinitionKind> + class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind> : public Basic_Arg_Traits_T< CORBA::DefinitionKind @@ -163,13 +164,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:612 + // be\be_visitor_arg_traits.cpp:662 #if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_) #define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription> + class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription> : public Var_Size_Arg_Traits_T< CORBA::InterfaceDef::FullInterfaceDescription, @@ -182,13 +183,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::InterfaceDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq> : public Var_Size_Arg_Traits_T< CORBA::InterfaceDefSeq, @@ -201,13 +202,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_) #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::StructMemberSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::StructMemberSeq> : public Var_Size_Arg_Traits_T< CORBA::StructMemberSeq, @@ -220,13 +221,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_SS_) #define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ExcDescriptionSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ExcDescriptionSeq> : public Var_Size_Arg_Traits_T< CORBA::ExcDescriptionSeq, @@ -239,13 +240,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_) #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::UnionMemberSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionMemberSeq> : public Var_Size_Arg_Traits_T< CORBA::UnionMemberSeq, @@ -258,13 +259,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_) #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::EnumMemberSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumMemberSeq> : public Var_Size_Arg_Traits_T< CORBA::EnumMemberSeq, @@ -379,13 +380,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:574 + // be\be_visitor_arg_traits.cpp:624 #if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_SS_) #define _CORBA_PRIMITIVEKIND__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::PrimitiveKind> + class TAO_IFR_Client_Export Arg_Traits<CORBA::PrimitiveKind> : public Basic_Arg_Traits_T< CORBA::PrimitiveKind @@ -396,13 +397,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ExceptionDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq> : public Var_Size_Arg_Traits_T< CORBA::ExceptionDefSeq, @@ -415,13 +416,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:574 + // be\be_visitor_arg_traits.cpp:624 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_) #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::AttributeMode> + class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeMode> : public Basic_Arg_Traits_T< CORBA::AttributeMode @@ -449,13 +450,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:612 + // be\be_visitor_arg_traits.cpp:662 #if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_SS_) #define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ExtAttributeDescription> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtAttributeDescription> : public Var_Size_Arg_Traits_T< CORBA::ExtAttributeDescription, @@ -485,13 +486,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:574 + // be\be_visitor_arg_traits.cpp:624 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_) #define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::OperationMode> + class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode> : public Basic_Arg_Traits_T< CORBA::OperationMode @@ -502,13 +503,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_) #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ParDescriptionSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq> : public Var_Size_Arg_Traits_T< CORBA::ParDescriptionSeq, @@ -521,13 +522,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_) #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ContextIdSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq> : public Var_Size_Arg_Traits_T< CORBA::ContextIdSeq, @@ -557,13 +558,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:612 + // be\be_visitor_arg_traits.cpp:662 #if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_) #define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription> + class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription> : public Var_Size_Arg_Traits_T< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, @@ -591,7 +592,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -751,7 +752,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_lookup_id : public TAO_ServerReques public: TAO_ServerRequestInfo_CORBA_Repository_lookup_id ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Repository *tao_impl, const char * search_id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -806,7 +807,7 @@ private: TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Repository_lookup_id ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Repository *tao_impl, const char * search_id ACE_ENV_ARG_DECL_NOT_USED @@ -906,7 +907,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode : public TAO public: TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Repository *tao_impl, ::CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -961,7 +962,7 @@ private: TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Repository *tao_impl, ::CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL_NOT_USED @@ -1061,7 +1062,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_get_primitive : public TAO_ServerRe public: TAO_ServerRequestInfo_CORBA_Repository_get_primitive ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Repository *tao_impl, ::CORBA::PrimitiveKind & kind ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1116,7 +1117,7 @@ private: TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORBA_Repository_get_primitive ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Repository *tao_impl, ::CORBA::PrimitiveKind & kind ACE_ENV_ARG_DECL_NOT_USED @@ -1216,7 +1217,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_string : public TAO_ServerRe public: TAO_ServerRequestInfo_CORBA_Repository_create_string ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Repository *tao_impl, const ::CORBA::ULong & bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1271,7 +1272,7 @@ private: TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORBA_Repository_create_string ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Repository *tao_impl, const ::CORBA::ULong & bound ACE_ENV_ARG_DECL_NOT_USED @@ -1371,7 +1372,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_wstring : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_Repository_create_wstring ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Repository *tao_impl, const ::CORBA::ULong & bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1426,7 +1427,7 @@ private: TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_CORBA_Repository_create_wstring ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Repository *tao_impl, const ::CORBA::ULong & bound ACE_ENV_ARG_DECL_NOT_USED @@ -1526,7 +1527,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_sequence : public TAO_Server public: TAO_ServerRequestInfo_CORBA_Repository_create_sequence ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Repository *tao_impl, const ::CORBA::ULong & bound, ::CORBA::IDLType_ptr element_type @@ -1583,7 +1584,7 @@ private: TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CORBA_Repository_create_sequence ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Repository *tao_impl, const ::CORBA::ULong & bound, ::CORBA::IDLType_ptr element_type @@ -1689,7 +1690,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_array : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_Repository_create_array ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Repository *tao_impl, const ::CORBA::ULong & length, ::CORBA::IDLType_ptr element_type @@ -1746,7 +1747,7 @@ private: TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA_Repository_create_array ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Repository *tao_impl, const ::CORBA::ULong & length, ::CORBA::IDLType_ptr element_type @@ -1852,7 +1853,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_fixed : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_Repository_create_fixed ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::Repository *tao_impl, const ::CORBA::UShort & digits, const ::CORBA::Short & scale @@ -1909,7 +1910,7 @@ private: TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA_Repository_create_fixed ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::Repository *tao_impl, const ::CORBA::UShort & digits, const ::CORBA::Short & scale @@ -2061,7 +2062,7 @@ POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -2131,7 +2132,7 @@ POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -2442,9 +2443,9 @@ void POA_CORBA::Repository::lookup_id_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -2590,9 +2591,9 @@ void POA_CORBA::Repository::get_canonical_typecode_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -2738,9 +2739,9 @@ void POA_CORBA::Repository::get_primitive_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -2886,9 +2887,9 @@ void POA_CORBA::Repository::create_string_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -3034,9 +3035,9 @@ void POA_CORBA::Repository::create_wstring_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -3184,9 +3185,9 @@ void POA_CORBA::Repository::create_sequence_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -3338,9 +3339,9 @@ void POA_CORBA::Repository::create_array_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -3492,9 +3493,9 @@ void POA_CORBA::Repository::create_fixed_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -3629,7 +3630,7 @@ void POA_CORBA::Repository::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::Repository *_tao_impl = - (POA_CORBA::Repository *) _tao_servant; + static_cast<POA_CORBA::Repository *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -3659,7 +3660,7 @@ void POA_CORBA::Repository::_non_existent_skel ( ) { POA_CORBA::Repository *_tao_impl = - (POA_CORBA::Repository *) _tao_servant; + static_cast<POA_CORBA::Repository *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -3692,7 +3693,7 @@ void POA_CORBA::Repository::_interface_skel ( } POA_CORBA::Repository *_tao_impl = - (POA_CORBA::Repository *) _tao_servant; + static_cast<POA_CORBA::Repository *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -3723,7 +3724,7 @@ void POA_CORBA::Repository::_component_skel ( ) { POA_CORBA::Repository *_tao_impl = - (POA_CORBA::Repository *) _tao_object_reference; + static_cast<POA_CORBA::Repository *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -3743,31 +3744,25 @@ CORBA::Boolean POA_CORBA::Repository::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Repository:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::Repository::_downcast ( @@ -3807,7 +3802,7 @@ const char* POA_CORBA::Repository::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::Repository::_dispatch ( TAO_ServerRequest &req, @@ -3822,7 +3817,7 @@ void POA_CORBA::Repository::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::Repository * POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -3833,22 +3828,14 @@ POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -3875,7 +3862,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -4084,7 +4071,7 @@ POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -4154,7 +4141,7 @@ POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -4232,7 +4219,7 @@ void POA_CORBA::ModuleDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ModuleDef *_tao_impl = - (POA_CORBA::ModuleDef *) _tao_servant; + static_cast<POA_CORBA::ModuleDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -4262,7 +4249,7 @@ void POA_CORBA::ModuleDef::_non_existent_skel ( ) { POA_CORBA::ModuleDef *_tao_impl = - (POA_CORBA::ModuleDef *) _tao_servant; + static_cast<POA_CORBA::ModuleDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -4295,7 +4282,7 @@ void POA_CORBA::ModuleDef::_interface_skel ( } POA_CORBA::ModuleDef *_tao_impl = - (POA_CORBA::ModuleDef *) _tao_servant; + static_cast<POA_CORBA::ModuleDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -4326,7 +4313,7 @@ void POA_CORBA::ModuleDef::_component_skel ( ) { POA_CORBA::ModuleDef *_tao_impl = - (POA_CORBA::ModuleDef *) _tao_object_reference; + static_cast<POA_CORBA::ModuleDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -4346,35 +4333,29 @@ CORBA::Boolean POA_CORBA::ModuleDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ModuleDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ModuleDef::_downcast ( @@ -4420,7 +4401,7 @@ const char* POA_CORBA::ModuleDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ModuleDef::_dispatch ( TAO_ServerRequest &req, @@ -4435,7 +4416,7 @@ void POA_CORBA::ModuleDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ModuleDef * POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -4446,22 +4427,14 @@ POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -4488,7 +4461,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -4636,7 +4609,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_type_get : public TAO_ServerReques public: TAO_ServerRequestInfo_CORBA_ConstantDef_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ConstantDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -4689,7 +4662,7 @@ private: TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ConstantDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -4779,7 +4752,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get : public TAO_ServerRe public: TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ConstantDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -4832,7 +4805,7 @@ private: TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ConstantDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -4922,7 +4895,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set : public TAO_ServerRe public: TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ConstantDef *tao_impl, ::CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -4974,7 +4947,7 @@ private: TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ConstantDef *tao_impl, ::CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_NOT_USED @@ -5063,7 +5036,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_value_get : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_ConstantDef_value_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ConstantDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -5116,7 +5089,7 @@ private: TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::TAO_ServerRequestInfo_CORBA_ConstantDef_value_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ConstantDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -5206,7 +5179,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_value_set : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_ConstantDef_value_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ConstantDef *tao_impl, const ::CORBA::Any & value ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -5258,7 +5231,7 @@ private: TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_ConstantDef_value_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ConstantDef *tao_impl, const ::CORBA::Any & value ACE_ENV_ARG_DECL_NOT_USED @@ -5393,7 +5366,7 @@ POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -5463,7 +5436,7 @@ POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -5675,9 +5648,9 @@ void POA_CORBA::ConstantDef::_get_type_skel ( CORBA::TypeCode_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -5810,9 +5783,9 @@ void POA_CORBA::ConstantDef::_get_type_def_skel ( ::CORBA::IDLType_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -5956,9 +5929,9 @@ void POA_CORBA::ConstantDef::_set_type_def_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -6074,9 +6047,9 @@ void POA_CORBA::ConstantDef::_get_value_skel ( CORBA::Any_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -6220,9 +6193,9 @@ void POA_CORBA::ConstantDef::_set_value_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -6333,7 +6306,7 @@ void POA_CORBA::ConstantDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ConstantDef *_tao_impl = - (POA_CORBA::ConstantDef *) _tao_servant; + static_cast<POA_CORBA::ConstantDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -6363,7 +6336,7 @@ void POA_CORBA::ConstantDef::_non_existent_skel ( ) { POA_CORBA::ConstantDef *_tao_impl = - (POA_CORBA::ConstantDef *) _tao_servant; + static_cast<POA_CORBA::ConstantDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -6396,7 +6369,7 @@ void POA_CORBA::ConstantDef::_interface_skel ( } POA_CORBA::ConstantDef *_tao_impl = - (POA_CORBA::ConstantDef *) _tao_servant; + static_cast<POA_CORBA::ConstantDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -6427,7 +6400,7 @@ void POA_CORBA::ConstantDef::_component_skel ( ) { POA_CORBA::ConstantDef *_tao_impl = - (POA_CORBA::ConstantDef *) _tao_object_reference; + static_cast<POA_CORBA::ConstantDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -6447,31 +6420,25 @@ CORBA::Boolean POA_CORBA::ConstantDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ConstantDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ConstantDef::_downcast ( @@ -6511,7 +6478,7 @@ const char* POA_CORBA::ConstantDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ConstantDef::_dispatch ( TAO_ServerRequest &req, @@ -6526,7 +6493,7 @@ void POA_CORBA::ConstantDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ConstantDef * POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -6537,22 +6504,14 @@ POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -6579,7 +6538,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_StructDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -6745,7 +6704,7 @@ class TAO_ServerRequestInfo_CORBA_StructDef_members_get : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_StructDef_members_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::StructDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -6798,7 +6757,7 @@ private: TAO_ServerRequestInfo_CORBA_StructDef_members_get::TAO_ServerRequestInfo_CORBA_StructDef_members_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::StructDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -6888,7 +6847,7 @@ class TAO_ServerRequestInfo_CORBA_StructDef_members_set : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_StructDef_members_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::StructDef *tao_impl, const ::CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -6940,7 +6899,7 @@ private: TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_StructDef_members_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::StructDef *tao_impl, const ::CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_NOT_USED @@ -7075,7 +7034,7 @@ POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -7145,7 +7104,7 @@ POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -7282,9 +7241,9 @@ void POA_CORBA::StructDef::_get_members_skel ( ::CORBA::StructMemberSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -7428,9 +7387,9 @@ void POA_CORBA::StructDef::_set_members_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -7541,7 +7500,7 @@ void POA_CORBA::StructDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::StructDef *_tao_impl = - (POA_CORBA::StructDef *) _tao_servant; + static_cast<POA_CORBA::StructDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -7571,7 +7530,7 @@ void POA_CORBA::StructDef::_non_existent_skel ( ) { POA_CORBA::StructDef *_tao_impl = - (POA_CORBA::StructDef *) _tao_servant; + static_cast<POA_CORBA::StructDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -7604,7 +7563,7 @@ void POA_CORBA::StructDef::_interface_skel ( } POA_CORBA::StructDef *_tao_impl = - (POA_CORBA::StructDef *) _tao_servant; + static_cast<POA_CORBA::StructDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -7635,7 +7594,7 @@ void POA_CORBA::StructDef::_component_skel ( ) { POA_CORBA::StructDef *_tao_impl = - (POA_CORBA::StructDef *) _tao_object_reference; + static_cast<POA_CORBA::StructDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -7655,43 +7614,37 @@ CORBA::Boolean POA_CORBA::StructDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/TypedefDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/StructDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::StructDef::_downcast ( @@ -7749,7 +7702,7 @@ const char* POA_CORBA::StructDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::StructDef::_dispatch ( TAO_ServerRequest &req, @@ -7764,7 +7717,7 @@ void POA_CORBA::StructDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::StructDef * POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -7775,22 +7728,14 @@ POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -7817,7 +7762,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_UnionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -7988,7 +7933,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get : public TAO_S public: TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::UnionDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -8041,7 +7986,7 @@ private: TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::UnionDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -8131,7 +8076,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get : public T public: TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::UnionDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -8184,7 +8129,7 @@ private: TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::UnionDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -8274,7 +8219,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set : public T public: TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::UnionDef *tao_impl, ::CORBA::IDLType_ptr discriminator_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -8326,7 +8271,7 @@ private: TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::UnionDef *tao_impl, ::CORBA::IDLType_ptr discriminator_type_def ACE_ENV_ARG_DECL_NOT_USED @@ -8415,7 +8360,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_members_get : public TAO_ServerReques public: TAO_ServerRequestInfo_CORBA_UnionDef_members_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::UnionDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -8468,7 +8413,7 @@ private: TAO_ServerRequestInfo_CORBA_UnionDef_members_get::TAO_ServerRequestInfo_CORBA_UnionDef_members_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::UnionDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -8558,7 +8503,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_members_set : public TAO_ServerReques public: TAO_ServerRequestInfo_CORBA_UnionDef_members_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::UnionDef *tao_impl, const ::CORBA::UnionMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -8610,7 +8555,7 @@ private: TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_UnionDef_members_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::UnionDef *tao_impl, const ::CORBA::UnionMemberSeq & members ACE_ENV_ARG_DECL_NOT_USED @@ -8745,7 +8690,7 @@ POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -8815,7 +8760,7 @@ POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -9030,9 +8975,9 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel ( CORBA::TypeCode_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9165,9 +9110,9 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel ( ::CORBA::IDLType_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9311,9 +9256,9 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9429,9 +9374,9 @@ void POA_CORBA::UnionDef::_get_members_skel ( ::CORBA::UnionMemberSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9575,9 +9520,9 @@ void POA_CORBA::UnionDef::_set_members_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9688,7 +9633,7 @@ void POA_CORBA::UnionDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::UnionDef *_tao_impl = - (POA_CORBA::UnionDef *) _tao_servant; + static_cast<POA_CORBA::UnionDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -9718,7 +9663,7 @@ void POA_CORBA::UnionDef::_non_existent_skel ( ) { POA_CORBA::UnionDef *_tao_impl = - (POA_CORBA::UnionDef *) _tao_servant; + static_cast<POA_CORBA::UnionDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -9751,7 +9696,7 @@ void POA_CORBA::UnionDef::_interface_skel ( } POA_CORBA::UnionDef *_tao_impl = - (POA_CORBA::UnionDef *) _tao_servant; + static_cast<POA_CORBA::UnionDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -9782,7 +9727,7 @@ void POA_CORBA::UnionDef::_component_skel ( ) { POA_CORBA::UnionDef *_tao_impl = - (POA_CORBA::UnionDef *) _tao_object_reference; + static_cast<POA_CORBA::UnionDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -9802,43 +9747,37 @@ CORBA::Boolean POA_CORBA::UnionDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/TypedefDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/UnionDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::UnionDef::_downcast ( @@ -9896,7 +9835,7 @@ const char* POA_CORBA::UnionDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::UnionDef::_dispatch ( TAO_ServerRequest &req, @@ -9911,7 +9850,7 @@ void POA_CORBA::UnionDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::UnionDef * POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -9922,22 +9861,14 @@ POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -9964,7 +9895,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_EnumDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -10110,7 +10041,7 @@ class TAO_ServerRequestInfo_CORBA_EnumDef_members_get : public TAO_ServerRequest public: TAO_ServerRequestInfo_CORBA_EnumDef_members_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::EnumDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -10163,7 +10094,7 @@ private: TAO_ServerRequestInfo_CORBA_EnumDef_members_get::TAO_ServerRequestInfo_CORBA_EnumDef_members_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::EnumDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -10253,7 +10184,7 @@ class TAO_ServerRequestInfo_CORBA_EnumDef_members_set : public TAO_ServerRequest public: TAO_ServerRequestInfo_CORBA_EnumDef_members_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::EnumDef *tao_impl, const ::CORBA::EnumMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -10305,7 +10236,7 @@ private: TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_EnumDef_members_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::EnumDef *tao_impl, const ::CORBA::EnumMemberSeq & members ACE_ENV_ARG_DECL_NOT_USED @@ -10440,7 +10371,7 @@ POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -10510,7 +10441,7 @@ POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -10646,9 +10577,9 @@ void POA_CORBA::EnumDef::_get_members_skel ( ::CORBA::EnumMemberSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10792,9 +10723,9 @@ void POA_CORBA::EnumDef::_set_members_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10905,7 +10836,7 @@ void POA_CORBA::EnumDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::EnumDef *_tao_impl = - (POA_CORBA::EnumDef *) _tao_servant; + static_cast<POA_CORBA::EnumDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -10935,7 +10866,7 @@ void POA_CORBA::EnumDef::_non_existent_skel ( ) { POA_CORBA::EnumDef *_tao_impl = - (POA_CORBA::EnumDef *) _tao_servant; + static_cast<POA_CORBA::EnumDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -10968,7 +10899,7 @@ void POA_CORBA::EnumDef::_interface_skel ( } POA_CORBA::EnumDef *_tao_impl = - (POA_CORBA::EnumDef *) _tao_servant; + static_cast<POA_CORBA::EnumDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -10999,7 +10930,7 @@ void POA_CORBA::EnumDef::_component_skel ( ) { POA_CORBA::EnumDef *_tao_impl = - (POA_CORBA::EnumDef *) _tao_object_reference; + static_cast<POA_CORBA::EnumDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -11019,39 +10950,33 @@ CORBA::Boolean POA_CORBA::EnumDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/TypedefDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/EnumDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::EnumDef::_downcast ( @@ -11103,7 +11028,7 @@ const char* POA_CORBA::EnumDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::EnumDef::_dispatch ( TAO_ServerRequest &req, @@ -11118,7 +11043,7 @@ void POA_CORBA::EnumDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::EnumDef * POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -11129,22 +11054,14 @@ POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -11171,7 +11088,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_AliasDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -11317,7 +11234,7 @@ class TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get : public TAO_Se public: TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::AliasDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -11370,7 +11287,7 @@ private: TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::AliasDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -11460,7 +11377,7 @@ class TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set : public TAO_Se public: TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::AliasDef *tao_impl, ::CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -11512,7 +11429,7 @@ private: TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::AliasDef *tao_impl, ::CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_NOT_USED @@ -11647,7 +11564,7 @@ POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -11717,7 +11634,7 @@ POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -11853,9 +11770,9 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel ( ::CORBA::IDLType_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -11999,9 +11916,9 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12112,7 +12029,7 @@ void POA_CORBA::AliasDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::AliasDef *_tao_impl = - (POA_CORBA::AliasDef *) _tao_servant; + static_cast<POA_CORBA::AliasDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -12142,7 +12059,7 @@ void POA_CORBA::AliasDef::_non_existent_skel ( ) { POA_CORBA::AliasDef *_tao_impl = - (POA_CORBA::AliasDef *) _tao_servant; + static_cast<POA_CORBA::AliasDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12175,7 +12092,7 @@ void POA_CORBA::AliasDef::_interface_skel ( } POA_CORBA::AliasDef *_tao_impl = - (POA_CORBA::AliasDef *) _tao_servant; + static_cast<POA_CORBA::AliasDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12206,7 +12123,7 @@ void POA_CORBA::AliasDef::_component_skel ( ) { POA_CORBA::AliasDef *_tao_impl = - (POA_CORBA::AliasDef *) _tao_object_reference; + static_cast<POA_CORBA::AliasDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12226,39 +12143,33 @@ CORBA::Boolean POA_CORBA::AliasDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/TypedefDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/AliasDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::AliasDef::_downcast ( @@ -12310,7 +12221,7 @@ const char* POA_CORBA::AliasDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::AliasDef::_dispatch ( TAO_ServerRequest &req, @@ -12325,7 +12236,7 @@ void POA_CORBA::AliasDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::AliasDef * POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -12336,22 +12247,14 @@ POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -12378,7 +12281,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_NativeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -12568,7 +12471,7 @@ POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -12638,7 +12541,7 @@ POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -12717,7 +12620,7 @@ void POA_CORBA::NativeDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::NativeDef *_tao_impl = - (POA_CORBA::NativeDef *) _tao_servant; + static_cast<POA_CORBA::NativeDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -12747,7 +12650,7 @@ void POA_CORBA::NativeDef::_non_existent_skel ( ) { POA_CORBA::NativeDef *_tao_impl = - (POA_CORBA::NativeDef *) _tao_servant; + static_cast<POA_CORBA::NativeDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12780,7 +12683,7 @@ void POA_CORBA::NativeDef::_interface_skel ( } POA_CORBA::NativeDef *_tao_impl = - (POA_CORBA::NativeDef *) _tao_servant; + static_cast<POA_CORBA::NativeDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12811,7 +12714,7 @@ void POA_CORBA::NativeDef::_component_skel ( ) { POA_CORBA::NativeDef *_tao_impl = - (POA_CORBA::NativeDef *) _tao_object_reference; + static_cast<POA_CORBA::NativeDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12831,39 +12734,33 @@ CORBA::Boolean POA_CORBA::NativeDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/TypedefDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/NativeDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::NativeDef::_downcast ( @@ -12915,7 +12812,7 @@ const char* POA_CORBA::NativeDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::NativeDef::_dispatch ( TAO_ServerRequest &req, @@ -12930,7 +12827,7 @@ void POA_CORBA::NativeDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::NativeDef * POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -12941,22 +12838,14 @@ POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -12983,7 +12872,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -13098,7 +12987,7 @@ class TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::PrimitiveDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -13151,7 +13040,7 @@ private: TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::PrimitiveDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -13287,7 +13176,7 @@ POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -13357,7 +13246,7 @@ POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -13465,9 +13354,9 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel ( ::CORBA::PrimitiveKind _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -13594,7 +13483,7 @@ void POA_CORBA::PrimitiveDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::PrimitiveDef *_tao_impl = - (POA_CORBA::PrimitiveDef *) _tao_servant; + static_cast<POA_CORBA::PrimitiveDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -13624,7 +13513,7 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel ( ) { POA_CORBA::PrimitiveDef *_tao_impl = - (POA_CORBA::PrimitiveDef *) _tao_servant; + static_cast<POA_CORBA::PrimitiveDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -13657,7 +13546,7 @@ void POA_CORBA::PrimitiveDef::_interface_skel ( } POA_CORBA::PrimitiveDef *_tao_impl = - (POA_CORBA::PrimitiveDef *) _tao_servant; + static_cast<POA_CORBA::PrimitiveDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -13688,7 +13577,7 @@ void POA_CORBA::PrimitiveDef::_component_skel ( ) { POA_CORBA::PrimitiveDef *_tao_impl = - (POA_CORBA::PrimitiveDef *) _tao_object_reference; + static_cast<POA_CORBA::PrimitiveDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -13708,31 +13597,25 @@ CORBA::Boolean POA_CORBA::PrimitiveDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/PrimitiveDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::PrimitiveDef::_downcast ( @@ -13772,7 +13655,7 @@ const char* POA_CORBA::PrimitiveDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::PrimitiveDef::_dispatch ( TAO_ServerRequest &req, @@ -13787,7 +13670,7 @@ void POA_CORBA::PrimitiveDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::PrimitiveDef * POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -13798,22 +13681,14 @@ POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -13840,7 +13715,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_StringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -13974,7 +13849,7 @@ class TAO_ServerRequestInfo_CORBA_StringDef_bound_get : public TAO_ServerRequest public: TAO_ServerRequestInfo_CORBA_StringDef_bound_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::StringDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -14027,7 +13902,7 @@ private: TAO_ServerRequestInfo_CORBA_StringDef_bound_get::TAO_ServerRequestInfo_CORBA_StringDef_bound_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::StringDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -14117,7 +13992,7 @@ class TAO_ServerRequestInfo_CORBA_StringDef_bound_set : public TAO_ServerRequest public: TAO_ServerRequestInfo_CORBA_StringDef_bound_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::StringDef *tao_impl, const ::CORBA::ULong & bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -14169,7 +14044,7 @@ private: TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_StringDef_bound_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::StringDef *tao_impl, const ::CORBA::ULong & bound ACE_ENV_ARG_DECL_NOT_USED @@ -14304,7 +14179,7 @@ POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -14374,7 +14249,7 @@ POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -14508,9 +14383,9 @@ void POA_CORBA::StringDef::_get_bound_skel ( CORBA::ULong _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -14653,9 +14528,9 @@ void POA_CORBA::StringDef::_set_bound_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -14766,7 +14641,7 @@ void POA_CORBA::StringDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::StringDef *_tao_impl = - (POA_CORBA::StringDef *) _tao_servant; + static_cast<POA_CORBA::StringDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -14796,7 +14671,7 @@ void POA_CORBA::StringDef::_non_existent_skel ( ) { POA_CORBA::StringDef *_tao_impl = - (POA_CORBA::StringDef *) _tao_servant; + static_cast<POA_CORBA::StringDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14829,7 +14704,7 @@ void POA_CORBA::StringDef::_interface_skel ( } POA_CORBA::StringDef *_tao_impl = - (POA_CORBA::StringDef *) _tao_servant; + static_cast<POA_CORBA::StringDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14860,7 +14735,7 @@ void POA_CORBA::StringDef::_component_skel ( ) { POA_CORBA::StringDef *_tao_impl = - (POA_CORBA::StringDef *) _tao_object_reference; + static_cast<POA_CORBA::StringDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14880,31 +14755,25 @@ CORBA::Boolean POA_CORBA::StringDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/StringDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::StringDef::_downcast ( @@ -14944,7 +14813,7 @@ const char* POA_CORBA::StringDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::StringDef::_dispatch ( TAO_ServerRequest &req, @@ -14959,7 +14828,7 @@ void POA_CORBA::StringDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::StringDef * POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -14970,22 +14839,14 @@ POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -15012,7 +14873,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_WstringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -15146,7 +15007,7 @@ class TAO_ServerRequestInfo_CORBA_WstringDef_bound_get : public TAO_ServerReques public: TAO_ServerRequestInfo_CORBA_WstringDef_bound_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::WstringDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -15199,7 +15060,7 @@ private: TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::TAO_ServerRequestInfo_CORBA_WstringDef_bound_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::WstringDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -15289,7 +15150,7 @@ class TAO_ServerRequestInfo_CORBA_WstringDef_bound_set : public TAO_ServerReques public: TAO_ServerRequestInfo_CORBA_WstringDef_bound_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::WstringDef *tao_impl, const ::CORBA::ULong & bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -15341,7 +15202,7 @@ private: TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_WstringDef_bound_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::WstringDef *tao_impl, const ::CORBA::ULong & bound ACE_ENV_ARG_DECL_NOT_USED @@ -15476,7 +15337,7 @@ POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -15546,7 +15407,7 @@ POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -15680,9 +15541,9 @@ void POA_CORBA::WstringDef::_get_bound_skel ( CORBA::ULong _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -15825,9 +15686,9 @@ void POA_CORBA::WstringDef::_set_bound_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -15938,7 +15799,7 @@ void POA_CORBA::WstringDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::WstringDef *_tao_impl = - (POA_CORBA::WstringDef *) _tao_servant; + static_cast<POA_CORBA::WstringDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -15968,7 +15829,7 @@ void POA_CORBA::WstringDef::_non_existent_skel ( ) { POA_CORBA::WstringDef *_tao_impl = - (POA_CORBA::WstringDef *) _tao_servant; + static_cast<POA_CORBA::WstringDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -16001,7 +15862,7 @@ void POA_CORBA::WstringDef::_interface_skel ( } POA_CORBA::WstringDef *_tao_impl = - (POA_CORBA::WstringDef *) _tao_servant; + static_cast<POA_CORBA::WstringDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -16032,7 +15893,7 @@ void POA_CORBA::WstringDef::_component_skel ( ) { POA_CORBA::WstringDef *_tao_impl = - (POA_CORBA::WstringDef *) _tao_object_reference; + static_cast<POA_CORBA::WstringDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -16052,31 +15913,25 @@ CORBA::Boolean POA_CORBA::WstringDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/WstringDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::WstringDef::_downcast ( @@ -16116,7 +15971,7 @@ const char* POA_CORBA::WstringDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::WstringDef::_dispatch ( TAO_ServerRequest &req, @@ -16131,7 +15986,7 @@ void POA_CORBA::WstringDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::WstringDef * POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -16142,22 +15997,14 @@ POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -16184,7 +16031,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -16321,7 +16168,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::SequenceDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -16374,7 +16221,7 @@ private: TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::SequenceDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -16464,7 +16311,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::SequenceDef *tao_impl, const ::CORBA::ULong & bound ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -16516,7 +16363,7 @@ private: TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::SequenceDef *tao_impl, const ::CORBA::ULong & bound ACE_ENV_ARG_DECL_NOT_USED @@ -16605,7 +16452,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_Serv public: TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::SequenceDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -16658,7 +16505,7 @@ private: TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::SequenceDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -16748,7 +16595,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get : public TAO_ public: TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::SequenceDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -16801,7 +16648,7 @@ private: TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::SequenceDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -16891,7 +16738,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set : public TAO_ public: TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::SequenceDef *tao_impl, ::CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -16943,7 +16790,7 @@ private: TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::SequenceDef *tao_impl, ::CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL_NOT_USED @@ -17078,7 +16925,7 @@ POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -17148,7 +16995,7 @@ POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -17360,9 +17207,9 @@ void POA_CORBA::SequenceDef::_get_bound_skel ( CORBA::ULong _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -17505,9 +17352,9 @@ void POA_CORBA::SequenceDef::_set_bound_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -17623,9 +17470,9 @@ void POA_CORBA::SequenceDef::_get_element_type_skel ( CORBA::TypeCode_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -17758,9 +17605,9 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel ( ::CORBA::IDLType_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -17904,9 +17751,9 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -18017,7 +17864,7 @@ void POA_CORBA::SequenceDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::SequenceDef *_tao_impl = - (POA_CORBA::SequenceDef *) _tao_servant; + static_cast<POA_CORBA::SequenceDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -18047,7 +17894,7 @@ void POA_CORBA::SequenceDef::_non_existent_skel ( ) { POA_CORBA::SequenceDef *_tao_impl = - (POA_CORBA::SequenceDef *) _tao_servant; + static_cast<POA_CORBA::SequenceDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -18080,7 +17927,7 @@ void POA_CORBA::SequenceDef::_interface_skel ( } POA_CORBA::SequenceDef *_tao_impl = - (POA_CORBA::SequenceDef *) _tao_servant; + static_cast<POA_CORBA::SequenceDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -18111,7 +17958,7 @@ void POA_CORBA::SequenceDef::_component_skel ( ) { POA_CORBA::SequenceDef *_tao_impl = - (POA_CORBA::SequenceDef *) _tao_object_reference; + static_cast<POA_CORBA::SequenceDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -18131,31 +17978,25 @@ CORBA::Boolean POA_CORBA::SequenceDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/SequenceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::SequenceDef::_downcast ( @@ -18195,7 +18036,7 @@ const char* POA_CORBA::SequenceDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::SequenceDef::_dispatch ( TAO_ServerRequest &req, @@ -18210,7 +18051,7 @@ void POA_CORBA::SequenceDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::SequenceDef * POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -18221,22 +18062,14 @@ POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -18263,7 +18096,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -18400,7 +18233,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_length_get : public TAO_ServerRequest public: TAO_ServerRequestInfo_CORBA_ArrayDef_length_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ArrayDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -18453,7 +18286,7 @@ private: TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::TAO_ServerRequestInfo_CORBA_ArrayDef_length_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ArrayDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -18543,7 +18376,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_length_set : public TAO_ServerRequest public: TAO_ServerRequestInfo_CORBA_ArrayDef_length_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ArrayDef *tao_impl, const ::CORBA::ULong & length ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -18595,7 +18428,7 @@ private: TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_ArrayDef_length_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ArrayDef *tao_impl, const ::CORBA::ULong & length ACE_ENV_ARG_DECL_NOT_USED @@ -18684,7 +18517,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ArrayDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -18737,7 +18570,7 @@ private: TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ArrayDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -18827,7 +18660,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get : public TAO_Ser public: TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ArrayDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -18880,7 +18713,7 @@ private: TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ArrayDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -18970,7 +18803,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set : public TAO_Ser public: TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ArrayDef *tao_impl, ::CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -19022,7 +18855,7 @@ private: TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ArrayDef *tao_impl, ::CORBA::IDLType_ptr element_type_def ACE_ENV_ARG_DECL_NOT_USED @@ -19157,7 +18990,7 @@ POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -19227,7 +19060,7 @@ POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -19439,9 +19272,9 @@ void POA_CORBA::ArrayDef::_get_length_skel ( CORBA::ULong _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -19584,9 +19417,9 @@ void POA_CORBA::ArrayDef::_set_length_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -19702,9 +19535,9 @@ void POA_CORBA::ArrayDef::_get_element_type_skel ( CORBA::TypeCode_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -19837,9 +19670,9 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel ( ::CORBA::IDLType_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -19983,9 +19816,9 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -20096,7 +19929,7 @@ void POA_CORBA::ArrayDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ArrayDef *_tao_impl = - (POA_CORBA::ArrayDef *) _tao_servant; + static_cast<POA_CORBA::ArrayDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -20126,7 +19959,7 @@ void POA_CORBA::ArrayDef::_non_existent_skel ( ) { POA_CORBA::ArrayDef *_tao_impl = - (POA_CORBA::ArrayDef *) _tao_servant; + static_cast<POA_CORBA::ArrayDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -20159,7 +19992,7 @@ void POA_CORBA::ArrayDef::_interface_skel ( } POA_CORBA::ArrayDef *_tao_impl = - (POA_CORBA::ArrayDef *) _tao_servant; + static_cast<POA_CORBA::ArrayDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -20190,7 +20023,7 @@ void POA_CORBA::ArrayDef::_component_skel ( ) { POA_CORBA::ArrayDef *_tao_impl = - (POA_CORBA::ArrayDef *) _tao_object_reference; + static_cast<POA_CORBA::ArrayDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -20210,31 +20043,25 @@ CORBA::Boolean POA_CORBA::ArrayDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ArrayDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ArrayDef::_downcast ( @@ -20274,7 +20101,7 @@ const char* POA_CORBA::ArrayDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ArrayDef::_dispatch ( TAO_ServerRequest &req, @@ -20289,7 +20116,7 @@ void POA_CORBA::ArrayDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ArrayDef * POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -20300,22 +20127,14 @@ POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -20342,7 +20161,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -20508,7 +20327,7 @@ class TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExceptionDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -20561,7 +20380,7 @@ private: TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExceptionDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -20651,7 +20470,7 @@ class TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get : public TAO_ServerRe public: TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExceptionDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -20704,7 +20523,7 @@ private: TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExceptionDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -20794,7 +20613,7 @@ class TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set : public TAO_ServerRe public: TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExceptionDef *tao_impl, const ::CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -20846,7 +20665,7 @@ private: TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExceptionDef *tao_impl, const ::CORBA::StructMemberSeq & members ACE_ENV_ARG_DECL_NOT_USED @@ -20981,7 +20800,7 @@ POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -21051,7 +20870,7 @@ POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -21212,9 +21031,9 @@ void POA_CORBA::ExceptionDef::_get_type_skel ( CORBA::TypeCode_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -21347,9 +21166,9 @@ void POA_CORBA::ExceptionDef::_get_members_skel ( ::CORBA::StructMemberSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -21493,9 +21312,9 @@ void POA_CORBA::ExceptionDef::_set_members_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -21606,7 +21425,7 @@ void POA_CORBA::ExceptionDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ExceptionDef *_tao_impl = - (POA_CORBA::ExceptionDef *) _tao_servant; + static_cast<POA_CORBA::ExceptionDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -21636,7 +21455,7 @@ void POA_CORBA::ExceptionDef::_non_existent_skel ( ) { POA_CORBA::ExceptionDef *_tao_impl = - (POA_CORBA::ExceptionDef *) _tao_servant; + static_cast<POA_CORBA::ExceptionDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -21669,7 +21488,7 @@ void POA_CORBA::ExceptionDef::_interface_skel ( } POA_CORBA::ExceptionDef *_tao_impl = - (POA_CORBA::ExceptionDef *) _tao_servant; + static_cast<POA_CORBA::ExceptionDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -21700,7 +21519,7 @@ void POA_CORBA::ExceptionDef::_component_skel ( ) { POA_CORBA::ExceptionDef *_tao_impl = - (POA_CORBA::ExceptionDef *) _tao_object_reference; + static_cast<POA_CORBA::ExceptionDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -21720,35 +21539,29 @@ CORBA::Boolean POA_CORBA::ExceptionDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ExceptionDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ExceptionDef::_downcast ( @@ -21794,7 +21607,7 @@ const char* POA_CORBA::ExceptionDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ExceptionDef::_dispatch ( TAO_ServerRequest &req, @@ -21809,7 +21622,7 @@ void POA_CORBA::ExceptionDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ExceptionDef * POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -21820,22 +21633,14 @@ POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -21862,7 +21667,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -22010,7 +21815,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_type_get : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_AttributeDef_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::AttributeDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -22063,7 +21868,7 @@ private: TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::AttributeDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -22153,7 +21958,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::AttributeDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -22206,7 +22011,7 @@ private: TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::AttributeDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -22296,7 +22101,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::AttributeDef *tao_impl, ::CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -22348,7 +22153,7 @@ private: TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::AttributeDef *tao_impl, ::CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_NOT_USED @@ -22437,7 +22242,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::AttributeDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -22490,7 +22295,7 @@ private: TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::AttributeDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -22580,7 +22385,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::AttributeDef *tao_impl, ::CORBA::AttributeMode & mode ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -22632,7 +22437,7 @@ private: TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::AttributeDef *tao_impl, ::CORBA::AttributeMode & mode ACE_ENV_ARG_DECL_NOT_USED @@ -22767,7 +22572,7 @@ POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -22837,7 +22642,7 @@ POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -23049,9 +22854,9 @@ void POA_CORBA::AttributeDef::_get_type_skel ( CORBA::TypeCode_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -23184,9 +22989,9 @@ void POA_CORBA::AttributeDef::_get_type_def_skel ( ::CORBA::IDLType_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -23330,9 +23135,9 @@ void POA_CORBA::AttributeDef::_set_type_def_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -23448,9 +23253,9 @@ void POA_CORBA::AttributeDef::_get_mode_skel ( ::CORBA::AttributeMode _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -23593,9 +23398,9 @@ void POA_CORBA::AttributeDef::_set_mode_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -23706,7 +23511,7 @@ void POA_CORBA::AttributeDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::AttributeDef *_tao_impl = - (POA_CORBA::AttributeDef *) _tao_servant; + static_cast<POA_CORBA::AttributeDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -23736,7 +23541,7 @@ void POA_CORBA::AttributeDef::_non_existent_skel ( ) { POA_CORBA::AttributeDef *_tao_impl = - (POA_CORBA::AttributeDef *) _tao_servant; + static_cast<POA_CORBA::AttributeDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -23769,7 +23574,7 @@ void POA_CORBA::AttributeDef::_interface_skel ( } POA_CORBA::AttributeDef *_tao_impl = - (POA_CORBA::AttributeDef *) _tao_servant; + static_cast<POA_CORBA::AttributeDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -23800,7 +23605,7 @@ void POA_CORBA::AttributeDef::_component_skel ( ) { POA_CORBA::AttributeDef *_tao_impl = - (POA_CORBA::AttributeDef *) _tao_object_reference; + static_cast<POA_CORBA::AttributeDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -23820,31 +23625,25 @@ CORBA::Boolean POA_CORBA::AttributeDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/AttributeDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::AttributeDef::_downcast ( @@ -23884,7 +23683,7 @@ const char* POA_CORBA::AttributeDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::AttributeDef::_dispatch ( TAO_ServerRequest &req, @@ -23899,7 +23698,7 @@ void POA_CORBA::AttributeDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::AttributeDef * POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -23910,22 +23709,14 @@ POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -23952,7 +23743,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -24105,7 +23896,7 @@ class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get : public TA public: TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExtAttributeDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -24158,7 +23949,7 @@ private: TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExtAttributeDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -24248,7 +24039,7 @@ class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set : public TA public: TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExtAttributeDef *tao_impl, const ::CORBA::ExcDescriptionSeq & get_exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -24300,7 +24091,7 @@ private: TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExtAttributeDef *tao_impl, const ::CORBA::ExcDescriptionSeq & get_exceptions ACE_ENV_ARG_DECL_NOT_USED @@ -24389,7 +24180,7 @@ class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get : public TA public: TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExtAttributeDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -24442,7 +24233,7 @@ private: TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExtAttributeDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -24532,7 +24323,7 @@ class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set : public TA public: TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExtAttributeDef *tao_impl, const ::CORBA::ExcDescriptionSeq & set_exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -24584,7 +24375,7 @@ private: TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExtAttributeDef *tao_impl, const ::CORBA::ExcDescriptionSeq & set_exceptions ACE_ENV_ARG_DECL_NOT_USED @@ -24673,7 +24464,7 @@ class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute : public TA public: TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExtAttributeDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -24726,7 +24517,7 @@ private: TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExtAttributeDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -24862,7 +24653,7 @@ POA_CORBA::_TAO_ExtAttributeDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -24932,7 +24723,7 @@ POA_CORBA::_TAO_ExtAttributeDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -25145,9 +24936,9 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel ( ::CORBA::ExcDescriptionSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -25291,9 +25082,9 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -25409,9 +25200,9 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel ( ::CORBA::ExcDescriptionSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -25555,9 +25346,9 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -25673,9 +25464,9 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel ( ::CORBA::ExtAttributeDescription_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -25803,7 +25594,7 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ExtAttributeDef *_tao_impl = - (POA_CORBA::ExtAttributeDef *) _tao_servant; + static_cast<POA_CORBA::ExtAttributeDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -25833,7 +25624,7 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel ( ) { POA_CORBA::ExtAttributeDef *_tao_impl = - (POA_CORBA::ExtAttributeDef *) _tao_servant; + static_cast<POA_CORBA::ExtAttributeDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -25866,7 +25657,7 @@ void POA_CORBA::ExtAttributeDef::_interface_skel ( } POA_CORBA::ExtAttributeDef *_tao_impl = - (POA_CORBA::ExtAttributeDef *) _tao_servant; + static_cast<POA_CORBA::ExtAttributeDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -25897,7 +25688,7 @@ void POA_CORBA::ExtAttributeDef::_component_skel ( ) { POA_CORBA::ExtAttributeDef *_tao_impl = - (POA_CORBA::ExtAttributeDef *) _tao_object_reference; + static_cast<POA_CORBA::ExtAttributeDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -25917,35 +25708,29 @@ CORBA::Boolean POA_CORBA::ExtAttributeDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/AttributeDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ExtAttributeDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ExtAttributeDef::_downcast ( @@ -25991,7 +25776,7 @@ const char* POA_CORBA::ExtAttributeDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ExtAttributeDef::_dispatch ( TAO_ServerRequest &req, @@ -26006,7 +25791,7 @@ void POA_CORBA::ExtAttributeDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ExtAttributeDef * POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -26017,22 +25802,14 @@ POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -26059,7 +25836,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_OperationDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -26266,7 +26043,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_result_get : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_OperationDef_result_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -26319,7 +26096,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_result_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -26409,7 +26186,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get : public TAO_Serve public: TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -26462,7 +26239,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -26552,7 +26329,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set : public TAO_Serve public: TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl, ::CORBA::IDLType_ptr result_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -26604,7 +26381,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl, ::CORBA::IDLType_ptr result_def ACE_ENV_ARG_DECL_NOT_USED @@ -26693,7 +26470,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_params_get : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_OperationDef_params_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -26746,7 +26523,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_params_get::TAO_ServerRequestInfo_CORBA_OperationDef_params_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -26836,7 +26613,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_params_set : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_OperationDef_params_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl, const ::CORBA::ParDescriptionSeq & params ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -26888,7 +26665,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA_OperationDef_params_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl, const ::CORBA::ParDescriptionSeq & params ACE_ENV_ARG_DECL_NOT_USED @@ -26977,7 +26754,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_mode_get : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_OperationDef_mode_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -27030,7 +26807,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::TAO_ServerRequestInfo_CORBA_OperationDef_mode_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -27120,7 +26897,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_mode_set : public TAO_ServerReque public: TAO_ServerRequestInfo_CORBA_OperationDef_mode_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl, ::CORBA::OperationMode & mode ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -27172,7 +26949,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_OperationDef_mode_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl, ::CORBA::OperationMode & mode ACE_ENV_ARG_DECL_NOT_USED @@ -27261,7 +27038,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -27314,7 +27091,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -27404,7 +27181,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl, const ::CORBA::ContextIdSeq & contexts ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -27456,7 +27233,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl, const ::CORBA::ContextIdSeq & contexts ACE_ENV_ARG_DECL_NOT_USED @@ -27545,7 +27322,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_Serve public: TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -27598,7 +27375,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -27688,7 +27465,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set : public TAO_Serve public: TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::OperationDef *tao_impl, const ::CORBA::ExceptionDefSeq & exceptions ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -27740,7 +27517,7 @@ private: TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::OperationDef *tao_impl, const ::CORBA::ExceptionDefSeq & exceptions ACE_ENV_ARG_DECL_NOT_USED @@ -27875,7 +27652,7 @@ POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -27945,7 +27722,7 @@ POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -28313,9 +28090,9 @@ void POA_CORBA::OperationDef::_get_result_skel ( CORBA::TypeCode_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -28448,9 +28225,9 @@ void POA_CORBA::OperationDef::_get_result_def_skel ( ::CORBA::IDLType_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -28594,9 +28371,9 @@ void POA_CORBA::OperationDef::_set_result_def_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -28712,9 +28489,9 @@ void POA_CORBA::OperationDef::_get_params_skel ( ::CORBA::ParDescriptionSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -28858,9 +28635,9 @@ void POA_CORBA::OperationDef::_set_params_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -28976,9 +28753,9 @@ void POA_CORBA::OperationDef::_get_mode_skel ( ::CORBA::OperationMode _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -29121,9 +28898,9 @@ void POA_CORBA::OperationDef::_set_mode_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -29239,9 +29016,9 @@ void POA_CORBA::OperationDef::_get_contexts_skel ( ::CORBA::ContextIdSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -29385,9 +29162,9 @@ void POA_CORBA::OperationDef::_set_contexts_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -29503,9 +29280,9 @@ void POA_CORBA::OperationDef::_get_exceptions_skel ( ::CORBA::ExceptionDefSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -29649,9 +29426,9 @@ void POA_CORBA::OperationDef::_set_exceptions_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -29762,7 +29539,7 @@ void POA_CORBA::OperationDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::OperationDef *_tao_impl = - (POA_CORBA::OperationDef *) _tao_servant; + static_cast<POA_CORBA::OperationDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -29792,7 +29569,7 @@ void POA_CORBA::OperationDef::_non_existent_skel ( ) { POA_CORBA::OperationDef *_tao_impl = - (POA_CORBA::OperationDef *) _tao_servant; + static_cast<POA_CORBA::OperationDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -29825,7 +29602,7 @@ void POA_CORBA::OperationDef::_interface_skel ( } POA_CORBA::OperationDef *_tao_impl = - (POA_CORBA::OperationDef *) _tao_servant; + static_cast<POA_CORBA::OperationDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -29856,7 +29633,7 @@ void POA_CORBA::OperationDef::_component_skel ( ) { POA_CORBA::OperationDef *_tao_impl = - (POA_CORBA::OperationDef *) _tao_object_reference; + static_cast<POA_CORBA::OperationDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -29876,31 +29653,25 @@ CORBA::Boolean POA_CORBA::OperationDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/OperationDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::OperationDef::_downcast ( @@ -29940,7 +29711,7 @@ const char* POA_CORBA::OperationDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::OperationDef::_dispatch ( TAO_ServerRequest &req, @@ -29955,7 +29726,7 @@ void POA_CORBA::OperationDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::OperationDef * POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -29966,22 +29737,14 @@ POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -30008,7 +29771,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -30179,7 +29942,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get : public TAO_ public: TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -30232,7 +29995,7 @@ private: TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -30322,7 +30085,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set : public TAO_ public: TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl, const ::CORBA::InterfaceDefSeq & base_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -30374,7 +30137,7 @@ private: TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl, const ::CORBA::InterfaceDefSeq & base_interfaces ACE_ENV_ARG_DECL_NOT_USED @@ -30463,7 +30226,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a : public TAO_ServerRequestIn public: TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl, const char * interface_id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -30518,7 +30281,7 @@ private: TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl, const char * interface_id ACE_ENV_ARG_DECL_NOT_USED @@ -30618,7 +30381,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface : public TAO_S public: TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -30671,7 +30434,7 @@ private: TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -30761,7 +30524,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute : public TAO_Ser public: TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl, const char * id, const char * name, @@ -30824,7 +30587,7 @@ private: TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl, const char * id, const char * name, @@ -30948,7 +30711,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation : public TAO_Ser public: TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl, const char * id, const char * name, @@ -31017,7 +30780,7 @@ private: TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::InterfaceDef *tao_impl, const char * id, const char * name, @@ -31205,7 +30968,7 @@ POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -31275,7 +31038,7 @@ POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -31529,9 +31292,9 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel ( ::CORBA::InterfaceDefSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -31675,9 +31438,9 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -31803,9 +31566,9 @@ void POA_CORBA::InterfaceDef::is_a_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -31940,9 +31703,9 @@ void POA_CORBA::InterfaceDef::describe_interface_skel ( ::CORBA::InterfaceDef::FullInterfaceDescription_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -32093,9 +31856,9 @@ void POA_CORBA::InterfaceDef::create_attribute_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -32271,9 +32034,9 @@ void POA_CORBA::InterfaceDef::create_operation_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -32432,7 +32195,7 @@ void POA_CORBA::InterfaceDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::InterfaceDef *_tao_impl = - (POA_CORBA::InterfaceDef *) _tao_servant; + static_cast<POA_CORBA::InterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -32462,7 +32225,7 @@ void POA_CORBA::InterfaceDef::_non_existent_skel ( ) { POA_CORBA::InterfaceDef *_tao_impl = - (POA_CORBA::InterfaceDef *) _tao_servant; + static_cast<POA_CORBA::InterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -32495,7 +32258,7 @@ void POA_CORBA::InterfaceDef::_interface_skel ( } POA_CORBA::InterfaceDef *_tao_impl = - (POA_CORBA::InterfaceDef *) _tao_servant; + static_cast<POA_CORBA::InterfaceDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -32526,7 +32289,7 @@ void POA_CORBA::InterfaceDef::_component_skel ( ) { POA_CORBA::InterfaceDef *_tao_impl = - (POA_CORBA::InterfaceDef *) _tao_object_reference; + static_cast<POA_CORBA::InterfaceDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -32546,39 +32309,33 @@ CORBA::Boolean POA_CORBA::InterfaceDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::InterfaceDef::_downcast ( @@ -32630,7 +32387,7 @@ const char* POA_CORBA::InterfaceDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::InterfaceDef::_dispatch ( TAO_ServerRequest &req, @@ -32645,7 +32402,7 @@ void POA_CORBA::InterfaceDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::InterfaceDef * POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -32656,22 +32413,14 @@ POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -32698,7 +32447,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -32811,7 +32560,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface public: TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::InterfaceAttrExtension *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -32864,7 +32613,7 @@ private: TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::InterfaceAttrExtension *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -32954,7 +32703,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute : public: TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::InterfaceAttrExtension *tao_impl, const char * id, const char * name, @@ -33021,7 +32770,7 @@ private: TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::InterfaceAttrExtension *tao_impl, const char * id, const char * name, @@ -33203,7 +32952,7 @@ POA_CORBA::_TAO_InterfaceAttrExtension_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -33273,7 +33022,7 @@ POA_CORBA::_TAO_InterfaceAttrExtension_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -33412,9 +33161,9 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel ( ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -33569,9 +33318,9 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -33726,7 +33475,7 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::InterfaceAttrExtension *_tao_impl = - (POA_CORBA::InterfaceAttrExtension *) _tao_servant; + static_cast<POA_CORBA::InterfaceAttrExtension *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -33756,7 +33505,7 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel ( ) { POA_CORBA::InterfaceAttrExtension *_tao_impl = - (POA_CORBA::InterfaceAttrExtension *) _tao_servant; + static_cast<POA_CORBA::InterfaceAttrExtension *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -33789,7 +33538,7 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel ( } POA_CORBA::InterfaceAttrExtension *_tao_impl = - (POA_CORBA::InterfaceAttrExtension *) _tao_servant; + static_cast<POA_CORBA::InterfaceAttrExtension *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -33820,7 +33569,7 @@ void POA_CORBA::InterfaceAttrExtension::_component_skel ( ) { POA_CORBA::InterfaceAttrExtension *_tao_impl = - (POA_CORBA::InterfaceAttrExtension *) _tao_object_reference; + static_cast<POA_CORBA::InterfaceAttrExtension *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -33840,23 +33589,17 @@ CORBA::Boolean POA_CORBA::InterfaceAttrExtension::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::InterfaceAttrExtension::_downcast ( @@ -33884,7 +33627,7 @@ const char* POA_CORBA::InterfaceAttrExtension::_interface_repository_id (void) c } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::InterfaceAttrExtension::_dispatch ( TAO_ServerRequest &req, @@ -33899,7 +33642,7 @@ void POA_CORBA::InterfaceAttrExtension::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::InterfaceAttrExtension * POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -33910,22 +33653,14 @@ POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -33952,7 +33687,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -34171,7 +33906,7 @@ POA_CORBA::_TAO_ExtInterfaceDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -34241,7 +33976,7 @@ POA_CORBA::_TAO_ExtInterfaceDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -34322,7 +34057,7 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ExtInterfaceDef *_tao_impl = - (POA_CORBA::ExtInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::ExtInterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -34352,7 +34087,7 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel ( ) { POA_CORBA::ExtInterfaceDef *_tao_impl = - (POA_CORBA::ExtInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::ExtInterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -34385,7 +34120,7 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel ( } POA_CORBA::ExtInterfaceDef *_tao_impl = - (POA_CORBA::ExtInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::ExtInterfaceDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -34416,7 +34151,7 @@ void POA_CORBA::ExtInterfaceDef::_component_skel ( ) { POA_CORBA::ExtInterfaceDef *_tao_impl = - (POA_CORBA::ExtInterfaceDef *) _tao_object_reference; + static_cast<POA_CORBA::ExtInterfaceDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -34436,47 +34171,41 @@ CORBA::Boolean POA_CORBA::ExtInterfaceDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ExtInterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ExtInterfaceDef::_downcast ( @@ -34540,7 +34269,7 @@ const char* POA_CORBA::ExtInterfaceDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ExtInterfaceDef::_dispatch ( TAO_ServerRequest &req, @@ -34555,7 +34284,7 @@ void POA_CORBA::ExtInterfaceDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ExtInterfaceDef * POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -34566,22 +34295,14 @@ POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -34608,7 +34329,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -34825,7 +34546,7 @@ POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -34895,7 +34616,7 @@ POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -34975,7 +34696,7 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::AbstractInterfaceDef *_tao_impl = - (POA_CORBA::AbstractInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::AbstractInterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -35005,7 +34726,7 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel ( ) { POA_CORBA::AbstractInterfaceDef *_tao_impl = - (POA_CORBA::AbstractInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::AbstractInterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -35038,7 +34759,7 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel ( } POA_CORBA::AbstractInterfaceDef *_tao_impl = - (POA_CORBA::AbstractInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::AbstractInterfaceDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -35069,7 +34790,7 @@ void POA_CORBA::AbstractInterfaceDef::_component_skel ( ) { POA_CORBA::AbstractInterfaceDef *_tao_impl = - (POA_CORBA::AbstractInterfaceDef *) _tao_object_reference; + static_cast<POA_CORBA::AbstractInterfaceDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -35089,43 +34810,37 @@ CORBA::Boolean POA_CORBA::AbstractInterfaceDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::AbstractInterfaceDef::_downcast ( @@ -35183,7 +34898,7 @@ const char* POA_CORBA::AbstractInterfaceDef::_interface_repository_id (void) con } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::AbstractInterfaceDef::_dispatch ( TAO_ServerRequest &req, @@ -35198,7 +34913,7 @@ void POA_CORBA::AbstractInterfaceDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::AbstractInterfaceDef * POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -35209,22 +34924,14 @@ POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -35251,7 +34958,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -35470,7 +35177,7 @@ POA_CORBA::_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -35540,7 +35247,7 @@ POA_CORBA::_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -35622,7 +35329,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ExtAbstractInterfaceDef *_tao_impl = - (POA_CORBA::ExtAbstractInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -35652,7 +35359,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel ( ) { POA_CORBA::ExtAbstractInterfaceDef *_tao_impl = - (POA_CORBA::ExtAbstractInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -35685,7 +35392,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel ( } POA_CORBA::ExtAbstractInterfaceDef *_tao_impl = - (POA_CORBA::ExtAbstractInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -35716,7 +35423,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_component_skel ( ) { POA_CORBA::ExtAbstractInterfaceDef *_tao_impl = - (POA_CORBA::ExtAbstractInterfaceDef *) _tao_object_reference; + static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -35736,51 +35443,45 @@ CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ExtAbstractInterfaceDef::_downcast ( @@ -35850,7 +35551,7 @@ const char* POA_CORBA::ExtAbstractInterfaceDef::_interface_repository_id (void) } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ExtAbstractInterfaceDef::_dispatch ( TAO_ServerRequest &req, @@ -35865,7 +35566,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ExtAbstractInterfaceDef * POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -35876,22 +35577,14 @@ POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -35918,7 +35611,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -36135,7 +35828,7 @@ POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -36205,7 +35898,7 @@ POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -36285,7 +35978,7 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::LocalInterfaceDef *_tao_impl = - (POA_CORBA::LocalInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::LocalInterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -36315,7 +36008,7 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel ( ) { POA_CORBA::LocalInterfaceDef *_tao_impl = - (POA_CORBA::LocalInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::LocalInterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -36348,7 +36041,7 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel ( } POA_CORBA::LocalInterfaceDef *_tao_impl = - (POA_CORBA::LocalInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::LocalInterfaceDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -36379,7 +36072,7 @@ void POA_CORBA::LocalInterfaceDef::_component_skel ( ) { POA_CORBA::LocalInterfaceDef *_tao_impl = - (POA_CORBA::LocalInterfaceDef *) _tao_object_reference; + static_cast<POA_CORBA::LocalInterfaceDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -36399,43 +36092,37 @@ CORBA::Boolean POA_CORBA::LocalInterfaceDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::LocalInterfaceDef::_downcast ( @@ -36493,7 +36180,7 @@ const char* POA_CORBA::LocalInterfaceDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::LocalInterfaceDef::_dispatch ( TAO_ServerRequest &req, @@ -36508,7 +36195,7 @@ void POA_CORBA::LocalInterfaceDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::LocalInterfaceDef * POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -36519,22 +36206,14 @@ POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -36561,7 +36240,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -36780,7 +36459,7 @@ POA_CORBA::_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -36850,7 +36529,7 @@ POA_CORBA::_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -36932,7 +36611,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ExtLocalInterfaceDef *_tao_impl = - (POA_CORBA::ExtLocalInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::ExtLocalInterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -36962,7 +36641,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel ( ) { POA_CORBA::ExtLocalInterfaceDef *_tao_impl = - (POA_CORBA::ExtLocalInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::ExtLocalInterfaceDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -36995,7 +36674,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel ( } POA_CORBA::ExtLocalInterfaceDef *_tao_impl = - (POA_CORBA::ExtLocalInterfaceDef *) _tao_servant; + static_cast<POA_CORBA::ExtLocalInterfaceDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -37026,7 +36705,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_component_skel ( ) { POA_CORBA::ExtLocalInterfaceDef *_tao_impl = - (POA_CORBA::ExtLocalInterfaceDef *) _tao_object_reference; + static_cast<POA_CORBA::ExtLocalInterfaceDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -37046,51 +36725,45 @@ CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ExtLocalInterfaceDef::_downcast ( @@ -37160,7 +36833,7 @@ const char* POA_CORBA::ExtLocalInterfaceDef::_interface_repository_id (void) con } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ExtLocalInterfaceDef::_dispatch ( TAO_ServerRequest &req, @@ -37175,7 +36848,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ExtLocalInterfaceDef * POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -37186,22 +36859,14 @@ POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h index e7ce65c380a..06d29cb6ef1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h @@ -28,12 +28,11 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:390 -#ifndef _TAO_IDL_SERVER_IFR_BASICS_H_ -#define _TAO_IDL_SERVER_IFR_BASICS_H_ +#ifndef _TAO_IDL_ORIG_IFR_BASICS_H_ +#define _TAO_IDL_ORIG_IFR_BASICS_H_ #include /**/ "ace/pre.h" -#include "tao/ParameterModeS.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "IFR_BaseS.h" @@ -16316,6 +16315,7 @@ namespace POA_CORBA // be\be_codegen.cpp:997 #include "IFR_BasicS_T.h" + #if defined (__ACE_INLINE__) #include "IFR_BasicS.inl" #endif /* defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp index a39452faa2a..b306a172bc0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:683 -#ifndef _TAO_IDL_SERVER_IFR_BASICS_T_CPP_ -#define _TAO_IDL_SERVER_IFR_BASICS_T_CPP_ +#ifndef _TAO_IDL_ORIG_IFR_BASICS_T_CPP_ +#define _TAO_IDL_ORIG_IFR_BASICS_T_CPP_ #include "IFR_BasicS_T.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h index f7440300c4b..888e59361a0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:546 -#ifndef _TAO_IDL_SERVER_IFR_BASICS_T_H_ -#define _TAO_IDL_SERVER_IFR_BASICS_T_H_ +#ifndef _TAO_IDL_ORIG_IFR_BASICS_T_H_ +#define _TAO_IDL_ORIG_IFR_BASICS_T_H_ #include /**/ "ace/pre.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp index 766daf322ca..2c07eab9f55 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp @@ -29,12 +29,13 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:609 -#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_CPP_ -#define _TAO_IDL_SERVER_IFR_COMPONENTSS_CPP_ +#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_ +#define _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_ #include "IFR_ComponentsS.h" -#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/ForwardRequestC.h" #include "tao/PortableServer/Operation_Table.h" #include "tao/TAO_Server_Request.h" #include "tao/ORB_Core.h" @@ -70,20 +71,20 @@ #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 { // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:574 + // be\be_visitor_arg_traits.cpp:624 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_) #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::DefinitionKind> + class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind> : public Basic_Arg_Traits_T< CORBA::DefinitionKind @@ -162,13 +163,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::InterfaceDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq> : public Var_Size_Arg_Traits_T< CORBA::InterfaceDefSeq, @@ -198,13 +199,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ValueDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq> : public Var_Size_Arg_Traits_T< CORBA::ValueDefSeq, @@ -217,13 +218,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_) #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::InitializerSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq> : public Var_Size_Arg_Traits_T< CORBA::InitializerSeq, @@ -236,13 +237,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_) #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ExtInitializerSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq> : public Var_Size_Arg_Traits_T< CORBA::ExtInitializerSeq, @@ -255,13 +256,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ExceptionDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq> : public Var_Size_Arg_Traits_T< CORBA::ExceptionDefSeq, @@ -274,13 +275,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:574 + // be\be_visitor_arg_traits.cpp:624 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_) #define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::OperationMode> + class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode> : public Basic_Arg_Traits_T< CORBA::OperationMode @@ -291,13 +292,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_) #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ParDescriptionSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq> : public Var_Size_Arg_Traits_T< CORBA::ParDescriptionSeq, @@ -310,13 +311,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_) #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ContextIdSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq> : public Var_Size_Arg_Traits_T< CORBA::ContextIdSeq, @@ -514,7 +515,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -749,7 +750,7 @@ POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -819,7 +820,7 @@ POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -900,7 +901,7 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::EventDef *_tao_impl = - (POA_CORBA::ComponentIR::EventDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::EventDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -930,7 +931,7 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::EventDef *_tao_impl = - (POA_CORBA::ComponentIR::EventDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::EventDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -963,7 +964,7 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel ( } POA_CORBA::ComponentIR::EventDef *_tao_impl = - (POA_CORBA::ComponentIR::EventDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::EventDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -994,7 +995,7 @@ void POA_CORBA::ComponentIR::EventDef::_component_skel ( ) { POA_CORBA::ComponentIR::EventDef *_tao_impl = - (POA_CORBA::ComponentIR::EventDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::EventDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -1014,47 +1015,41 @@ CORBA::Boolean POA_CORBA::ComponentIR::EventDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ValueDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ExtValueDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::EventDef::_downcast ( @@ -1118,7 +1113,7 @@ const char* POA_CORBA::ComponentIR::EventDef::_interface_repository_id (void) co } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::EventDef::_dispatch ( TAO_ServerRequest &req, @@ -1133,7 +1128,7 @@ void POA_CORBA::ComponentIR::EventDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::EventDef * POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -1144,22 +1139,14 @@ POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -1186,7 +1173,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -1340,7 +1327,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component : publi public: TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::Container *tao_impl, const char * id, const char * name, @@ -1403,7 +1390,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component::TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::Container *tao_impl, const char * id, const char * name, @@ -1527,7 +1514,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home : public TAO public: TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::Container *tao_impl, const char * id, const char * name, @@ -1594,7 +1581,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home::TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::Container *tao_impl, const char * id, const char * name, @@ -1730,7 +1717,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event : public TA public: TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::Container *tao_impl, const char * id, const char * name, @@ -1803,7 +1790,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event::TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::Container *tao_impl, const char * id, const char * name, @@ -2003,7 +1990,7 @@ POA_CORBA::ComponentIR::_TAO_Container_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -2073,7 +2060,7 @@ POA_CORBA::ComponentIR::_TAO_Container_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -2273,9 +2260,9 @@ void POA_CORBA::ComponentIR::Container::create_component_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -2449,9 +2436,9 @@ void POA_CORBA::ComponentIR::Container::create_home_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -2639,9 +2626,9 @@ void POA_CORBA::ComponentIR::Container::create_event_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -2808,7 +2795,7 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::Container *_tao_impl = - (POA_CORBA::ComponentIR::Container *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::Container *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -2838,7 +2825,7 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel ( ) { POA_CORBA::ComponentIR::Container *_tao_impl = - (POA_CORBA::ComponentIR::Container *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::Container *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -2871,7 +2858,7 @@ void POA_CORBA::ComponentIR::Container::_interface_skel ( } POA_CORBA::ComponentIR::Container *_tao_impl = - (POA_CORBA::ComponentIR::Container *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::Container *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -2902,7 +2889,7 @@ void POA_CORBA::ComponentIR::Container::_component_skel ( ) { POA_CORBA::ComponentIR::Container *_tao_impl = - (POA_CORBA::ComponentIR::Container *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::Container *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -2922,31 +2909,25 @@ CORBA::Boolean POA_CORBA::ComponentIR::Container::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::Container::_downcast ( @@ -2986,7 +2967,7 @@ const char* POA_CORBA::ComponentIR::Container::_interface_repository_id (void) c } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::Container::_dispatch ( TAO_ServerRequest &req, @@ -3001,7 +2982,7 @@ void POA_CORBA::ComponentIR::Container::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::Container * POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -3012,22 +2993,14 @@ POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -3054,7 +3027,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -3266,7 +3239,7 @@ POA_CORBA::ComponentIR::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -3336,7 +3309,7 @@ POA_CORBA::ComponentIR::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -3416,7 +3389,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::ModuleDef *_tao_impl = - (POA_CORBA::ComponentIR::ModuleDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ModuleDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -3446,7 +3419,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::ModuleDef *_tao_impl = - (POA_CORBA::ComponentIR::ModuleDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ModuleDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -3479,7 +3452,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel ( } POA_CORBA::ComponentIR::ModuleDef *_tao_impl = - (POA_CORBA::ComponentIR::ModuleDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ModuleDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -3510,7 +3483,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_component_skel ( ) { POA_CORBA::ComponentIR::ModuleDef *_tao_impl = - (POA_CORBA::ComponentIR::ModuleDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::ModuleDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -3530,43 +3503,37 @@ CORBA::Boolean POA_CORBA::ComponentIR::ModuleDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ModuleDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::ModuleDef::_downcast ( @@ -3624,7 +3591,7 @@ const char* POA_CORBA::ComponentIR::ModuleDef::_interface_repository_id (void) c } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::ModuleDef::_dispatch ( TAO_ServerRequest &req, @@ -3639,7 +3606,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::ModuleDef * POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -3650,22 +3617,14 @@ POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -3692,7 +3651,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -3903,7 +3862,7 @@ POA_CORBA::ComponentIR::_TAO_Repository_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -3973,7 +3932,7 @@ POA_CORBA::ComponentIR::_TAO_Repository_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -4052,7 +4011,7 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::Repository *_tao_impl = - (POA_CORBA::ComponentIR::Repository *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::Repository *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -4082,7 +4041,7 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel ( ) { POA_CORBA::ComponentIR::Repository *_tao_impl = - (POA_CORBA::ComponentIR::Repository *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::Repository *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -4115,7 +4074,7 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel ( } POA_CORBA::ComponentIR::Repository *_tao_impl = - (POA_CORBA::ComponentIR::Repository *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::Repository *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -4146,7 +4105,7 @@ void POA_CORBA::ComponentIR::Repository::_component_skel ( ) { POA_CORBA::ComponentIR::Repository *_tao_impl = - (POA_CORBA::ComponentIR::Repository *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::Repository *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -4166,39 +4125,33 @@ CORBA::Boolean POA_CORBA::ComponentIR::Repository::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Repository:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/Repository:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::Repository::_downcast ( @@ -4250,7 +4203,7 @@ const char* POA_CORBA::ComponentIR::Repository::_interface_repository_id (void) } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::Repository::_dispatch ( TAO_ServerRequest &req, @@ -4265,7 +4218,7 @@ void POA_CORBA::ComponentIR::Repository::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::Repository * POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -4276,22 +4229,14 @@ POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -4318,7 +4263,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -4463,7 +4408,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get : p public: TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ProvidesDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -4516,7 +4461,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ProvidesDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -4606,7 +4551,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set : p public: TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ProvidesDef *tao_impl, ::CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -4658,7 +4603,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ProvidesDef *tao_impl, ::CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL_NOT_USED @@ -4793,7 +4738,7 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -4863,7 +4808,7 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -4997,9 +4942,9 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel ( ::CORBA::InterfaceDef_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -5143,9 +5088,9 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -5256,7 +5201,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::ProvidesDef *_tao_impl = - (POA_CORBA::ComponentIR::ProvidesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -5286,7 +5231,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::ProvidesDef *_tao_impl = - (POA_CORBA::ComponentIR::ProvidesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -5319,7 +5264,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel ( } POA_CORBA::ComponentIR::ProvidesDef *_tao_impl = - (POA_CORBA::ComponentIR::ProvidesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -5350,7 +5295,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_component_skel ( ) { POA_CORBA::ComponentIR::ProvidesDef *_tao_impl = - (POA_CORBA::ComponentIR::ProvidesDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -5370,31 +5315,25 @@ CORBA::Boolean POA_CORBA::ComponentIR::ProvidesDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::ProvidesDef::_downcast ( @@ -5434,7 +5373,7 @@ const char* POA_CORBA::ComponentIR::ProvidesDef::_interface_repository_id (void) } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::ProvidesDef::_dispatch ( TAO_ServerRequest &req, @@ -5449,7 +5388,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::ProvidesDef * POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -5460,22 +5399,14 @@ POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -5502,7 +5433,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -5649,7 +5580,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get : publi public: TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::UsesDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -5702,7 +5633,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::UsesDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -5792,7 +5723,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set : publi public: TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::UsesDef *tao_impl, ::CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -5844,7 +5775,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::UsesDef *tao_impl, ::CORBA::InterfaceDef_ptr interface_type ACE_ENV_ARG_DECL_NOT_USED @@ -5933,7 +5864,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get : public T public: TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::UsesDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -5986,7 +5917,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::UsesDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -6076,7 +6007,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set : public T public: TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::UsesDef *tao_impl, const ::CORBA::Boolean & is_multiple ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -6128,7 +6059,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::UsesDef *tao_impl, const ::CORBA::Boolean & is_multiple ACE_ENV_ARG_DECL_NOT_USED @@ -6263,7 +6194,7 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -6333,7 +6264,7 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -6519,9 +6450,9 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel ( ::CORBA::InterfaceDef_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -6665,9 +6596,9 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -6783,9 +6714,9 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel ( CORBA::Boolean _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -6928,9 +6859,9 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -7041,7 +6972,7 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::UsesDef *_tao_impl = - (POA_CORBA::ComponentIR::UsesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::UsesDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -7071,7 +7002,7 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::UsesDef *_tao_impl = - (POA_CORBA::ComponentIR::UsesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::UsesDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -7104,7 +7035,7 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel ( } POA_CORBA::ComponentIR::UsesDef *_tao_impl = - (POA_CORBA::ComponentIR::UsesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::UsesDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -7135,7 +7066,7 @@ void POA_CORBA::ComponentIR::UsesDef::_component_skel ( ) { POA_CORBA::ComponentIR::UsesDef *_tao_impl = - (POA_CORBA::ComponentIR::UsesDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::UsesDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -7155,31 +7086,25 @@ CORBA::Boolean POA_CORBA::ComponentIR::UsesDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::UsesDef::_downcast ( @@ -7219,7 +7144,7 @@ const char* POA_CORBA::ComponentIR::UsesDef::_interface_repository_id (void) con } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::UsesDef::_dispatch ( TAO_ServerRequest &req, @@ -7234,7 +7159,7 @@ void POA_CORBA::ComponentIR::UsesDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::UsesDef * POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -7245,22 +7170,14 @@ POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -7287,7 +7204,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -7433,7 +7350,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get : public TA public: TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::EventPortDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -7486,7 +7403,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::EventPortDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -7576,7 +7493,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set : public TA public: TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::EventPortDef *tao_impl, ::CORBA::ComponentIR::EventDef_ptr event ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -7628,7 +7545,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::EventPortDef *tao_impl, ::CORBA::ComponentIR::EventDef_ptr event ACE_ENV_ARG_DECL_NOT_USED @@ -7717,7 +7634,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a : public TAO_Ser public: TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::EventPortDef *tao_impl, const char * event_id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -7772,7 +7689,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::EventPortDef *tao_impl, const char * event_id ACE_ENV_ARG_DECL_NOT_USED @@ -7918,7 +7835,7 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -7988,7 +7905,7 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -8149,9 +8066,9 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel ( ::CORBA::ComponentIR::EventDef_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -8295,9 +8212,9 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -8423,9 +8340,9 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -8555,7 +8472,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::EventPortDef *_tao_impl = - (POA_CORBA::ComponentIR::EventPortDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::EventPortDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -8585,7 +8502,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::EventPortDef *_tao_impl = - (POA_CORBA::ComponentIR::EventPortDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::EventPortDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -8618,7 +8535,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel ( } POA_CORBA::ComponentIR::EventPortDef *_tao_impl = - (POA_CORBA::ComponentIR::EventPortDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::EventPortDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -8649,7 +8566,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_component_skel ( ) { POA_CORBA::ComponentIR::EventPortDef *_tao_impl = - (POA_CORBA::ComponentIR::EventPortDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::EventPortDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -8669,31 +8586,25 @@ CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::EventPortDef::_downcast ( @@ -8733,7 +8644,7 @@ const char* POA_CORBA::ComponentIR::EventPortDef::_interface_repository_id (void } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::EventPortDef::_dispatch ( TAO_ServerRequest &req, @@ -8748,7 +8659,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::EventPortDef * POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -8759,22 +8670,14 @@ POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -8801,7 +8704,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -8993,7 +8896,7 @@ POA_CORBA::ComponentIR::_TAO_EmitsDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -9063,7 +8966,7 @@ POA_CORBA::ComponentIR::_TAO_EmitsDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -9141,7 +9044,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::EmitsDef *_tao_impl = - (POA_CORBA::ComponentIR::EmitsDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::EmitsDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -9171,7 +9074,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::EmitsDef *_tao_impl = - (POA_CORBA::ComponentIR::EmitsDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::EmitsDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -9204,7 +9107,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel ( } POA_CORBA::ComponentIR::EmitsDef *_tao_impl = - (POA_CORBA::ComponentIR::EmitsDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::EmitsDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -9235,7 +9138,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_component_skel ( ) { POA_CORBA::ComponentIR::EmitsDef *_tao_impl = - (POA_CORBA::ComponentIR::EmitsDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::EmitsDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -9255,35 +9158,29 @@ CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::EmitsDef::_downcast ( @@ -9329,7 +9226,7 @@ const char* POA_CORBA::ComponentIR::EmitsDef::_interface_repository_id (void) co } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::EmitsDef::_dispatch ( TAO_ServerRequest &req, @@ -9344,7 +9241,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::EmitsDef * POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -9355,22 +9252,14 @@ POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -9397,7 +9286,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -9589,7 +9478,7 @@ POA_CORBA::ComponentIR::_TAO_PublishesDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -9659,7 +9548,7 @@ POA_CORBA::ComponentIR::_TAO_PublishesDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -9737,7 +9626,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::PublishesDef *_tao_impl = - (POA_CORBA::ComponentIR::PublishesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::PublishesDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -9767,7 +9656,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::PublishesDef *_tao_impl = - (POA_CORBA::ComponentIR::PublishesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::PublishesDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -9800,7 +9689,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel ( } POA_CORBA::ComponentIR::PublishesDef *_tao_impl = - (POA_CORBA::ComponentIR::PublishesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::PublishesDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -9831,7 +9720,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_component_skel ( ) { POA_CORBA::ComponentIR::PublishesDef *_tao_impl = - (POA_CORBA::ComponentIR::PublishesDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::PublishesDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -9851,35 +9740,29 @@ CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::PublishesDef::_downcast ( @@ -9925,7 +9808,7 @@ const char* POA_CORBA::ComponentIR::PublishesDef::_interface_repository_id (void } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::PublishesDef::_dispatch ( TAO_ServerRequest &req, @@ -9940,7 +9823,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::PublishesDef * POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -9951,22 +9834,14 @@ POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -9993,7 +9868,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -10185,7 +10060,7 @@ POA_CORBA::ComponentIR::_TAO_ConsumesDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -10255,7 +10130,7 @@ POA_CORBA::ComponentIR::_TAO_ConsumesDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -10333,7 +10208,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::ConsumesDef *_tao_impl = - (POA_CORBA::ComponentIR::ConsumesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -10363,7 +10238,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::ConsumesDef *_tao_impl = - (POA_CORBA::ComponentIR::ConsumesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -10396,7 +10271,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel ( } POA_CORBA::ComponentIR::ConsumesDef *_tao_impl = - (POA_CORBA::ComponentIR::ConsumesDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -10427,7 +10302,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_component_skel ( ) { POA_CORBA::ComponentIR::ConsumesDef *_tao_impl = - (POA_CORBA::ComponentIR::ConsumesDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -10447,35 +10322,29 @@ CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::ConsumesDef::_downcast ( @@ -10521,7 +10390,7 @@ const char* POA_CORBA::ComponentIR::ConsumesDef::_interface_repository_id (void) } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::ConsumesDef::_dispatch ( TAO_ServerRequest &req, @@ -10536,7 +10405,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::ConsumesDef * POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -10547,22 +10416,14 @@ POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -10589,7 +10450,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -10772,7 +10633,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get : public: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -10825,7 +10686,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -10915,7 +10776,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set : public: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, ::CORBA::ComponentIR::ComponentDef_ptr base_component ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -10967,7 +10828,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, ::CORBA::ComponentIR::ComponentDef_ptr base_component ACE_ENV_ARG_DECL_NOT_USED @@ -11056,7 +10917,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_ public: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -11109,7 +10970,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -11199,7 +11060,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_ public: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const ::CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -11251,7 +11112,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const ::CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_NOT_USED @@ -11340,7 +11201,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides : pub public: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const char * id, const char * name, @@ -11401,7 +11262,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const char * id, const char * name, @@ -11519,7 +11380,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses : public public: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const char * id, const char * name, @@ -11582,7 +11443,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const char * id, const char * name, @@ -11706,7 +11567,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits : public public: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const char * id, const char * name, @@ -11767,7 +11628,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const char * id, const char * name, @@ -11885,7 +11746,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes : pu public: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const char * id, const char * name, @@ -11946,7 +11807,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const char * id, const char * name, @@ -12064,7 +11925,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes : pub public: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const char * id, const char * name, @@ -12125,7 +11986,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::ComponentDef *tao_impl, const char * id, const char * name, @@ -12289,7 +12150,7 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -12359,7 +12220,7 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -12701,9 +12562,9 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel ( ::CORBA::ComponentIR::ComponentDef_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12847,9 +12708,9 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12965,9 +12826,9 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel ( ::CORBA::InterfaceDefSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -13111,9 +12972,9 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -13245,9 +13106,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -13413,9 +13274,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -13583,9 +13444,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -13749,9 +13610,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -13915,9 +13776,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -14060,7 +13921,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::ComponentDef *_tao_impl = - (POA_CORBA::ComponentIR::ComponentDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ComponentDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -14090,7 +13951,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::ComponentDef *_tao_impl = - (POA_CORBA::ComponentIR::ComponentDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ComponentDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14123,7 +13984,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel ( } POA_CORBA::ComponentIR::ComponentDef *_tao_impl = - (POA_CORBA::ComponentIR::ComponentDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::ComponentDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14154,7 +14015,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_component_skel ( ) { POA_CORBA::ComponentIR::ComponentDef *_tao_impl = - (POA_CORBA::ComponentIR::ComponentDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::ComponentDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14174,51 +14035,45 @@ CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ExtInterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::ComponentDef::_downcast ( @@ -14288,7 +14143,7 @@ const char* POA_CORBA::ComponentIR::ComponentDef::_interface_repository_id (void } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::ComponentDef::_dispatch ( TAO_ServerRequest &req, @@ -14303,7 +14158,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::ComponentDef * POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -14314,22 +14169,14 @@ POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -14356,7 +14203,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -14609,7 +14456,7 @@ POA_CORBA::ComponentIR::_TAO_FactoryDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -14679,7 +14526,7 @@ POA_CORBA::ComponentIR::_TAO_FactoryDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -14757,7 +14604,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::FactoryDef *_tao_impl = - (POA_CORBA::ComponentIR::FactoryDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::FactoryDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -14787,7 +14634,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::FactoryDef *_tao_impl = - (POA_CORBA::ComponentIR::FactoryDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::FactoryDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14820,7 +14667,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel ( } POA_CORBA::ComponentIR::FactoryDef *_tao_impl = - (POA_CORBA::ComponentIR::FactoryDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::FactoryDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14851,7 +14698,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_component_skel ( ) { POA_CORBA::ComponentIR::FactoryDef *_tao_impl = - (POA_CORBA::ComponentIR::FactoryDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::FactoryDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14871,35 +14718,29 @@ CORBA::Boolean POA_CORBA::ComponentIR::FactoryDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/OperationDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::FactoryDef::_downcast ( @@ -14945,7 +14786,7 @@ const char* POA_CORBA::ComponentIR::FactoryDef::_interface_repository_id (void) } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::FactoryDef::_dispatch ( TAO_ServerRequest &req, @@ -14960,7 +14801,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::FactoryDef * POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -14971,22 +14812,14 @@ POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -15013,7 +14846,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -15266,7 +15099,7 @@ POA_CORBA::ComponentIR::_TAO_FinderDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -15336,7 +15169,7 @@ POA_CORBA::ComponentIR::_TAO_FinderDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -15414,7 +15247,7 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::FinderDef *_tao_impl = - (POA_CORBA::ComponentIR::FinderDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::FinderDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -15444,7 +15277,7 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::FinderDef *_tao_impl = - (POA_CORBA::ComponentIR::FinderDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::FinderDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -15477,7 +15310,7 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel ( } POA_CORBA::ComponentIR::FinderDef *_tao_impl = - (POA_CORBA::ComponentIR::FinderDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::FinderDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -15508,7 +15341,7 @@ void POA_CORBA::ComponentIR::FinderDef::_component_skel ( ) { POA_CORBA::ComponentIR::FinderDef *_tao_impl = - (POA_CORBA::ComponentIR::FinderDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::FinderDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -15528,35 +15361,29 @@ CORBA::Boolean POA_CORBA::ComponentIR::FinderDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/OperationDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::FinderDef::_downcast ( @@ -15602,7 +15429,7 @@ const char* POA_CORBA::ComponentIR::FinderDef::_interface_repository_id (void) c } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::FinderDef::_dispatch ( TAO_ServerRequest &req, @@ -15617,7 +15444,7 @@ void POA_CORBA::ComponentIR::FinderDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::FinderDef * POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -15628,22 +15455,14 @@ POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -15670,7 +15489,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -15855,7 +15674,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get : public TAO public: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -15908,7 +15727,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -15998,7 +15817,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set : public TAO public: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, ::CORBA::ComponentIR::HomeDef_ptr base_home ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -16050,7 +15869,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, ::CORBA::ComponentIR::HomeDef_ptr base_home ACE_ENV_ARG_DECL_NOT_USED @@ -16139,7 +15958,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get : public: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -16192,7 +16011,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -16282,7 +16101,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set : public: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, const ::CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -16334,7 +16153,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, const ::CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_NOT_USED @@ -16423,7 +16242,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get : pu public: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -16476,7 +16295,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -16566,7 +16385,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set : pu public: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, ::CORBA::ComponentIR::ComponentDef_ptr managed_component ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -16618,7 +16437,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, ::CORBA::ComponentIR::ComponentDef_ptr managed_component ACE_ENV_ARG_DECL_NOT_USED @@ -16707,7 +16526,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get : public T public: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -16760,7 +16579,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -16850,7 +16669,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set : public T public: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, ::CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -16902,7 +16721,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, ::CORBA::ValueDef_ptr primary_key ACE_ENV_ARG_DECL_NOT_USED @@ -16991,7 +16810,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory : public TA public: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, const char * id, const char * name, @@ -17054,7 +16873,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, const char * id, const char * name, @@ -17178,7 +16997,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder : public TAO public: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, const char * id, const char * name, @@ -17241,7 +17060,7 @@ private: TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ComponentIR::HomeDef *tao_impl, const char * id, const char * name, @@ -17411,7 +17230,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -17481,7 +17300,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -17838,9 +17657,9 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel ( ::CORBA::ComponentIR::HomeDef_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -17984,9 +17803,9 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -18102,9 +17921,9 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel ( ::CORBA::InterfaceDefSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -18248,9 +18067,9 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -18366,9 +18185,9 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel ( ::CORBA::ComponentIR::ComponentDef_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -18512,9 +18331,9 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -18630,9 +18449,9 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel ( ::CORBA::ValueDef_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -18776,9 +18595,9 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -18912,9 +18731,9 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -19084,9 +18903,9 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -19233,7 +19052,7 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ComponentIR::HomeDef *_tao_impl = - (POA_CORBA::ComponentIR::HomeDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::HomeDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -19263,7 +19082,7 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel ( ) { POA_CORBA::ComponentIR::HomeDef *_tao_impl = - (POA_CORBA::ComponentIR::HomeDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::HomeDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -19296,7 +19115,7 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel ( } POA_CORBA::ComponentIR::HomeDef *_tao_impl = - (POA_CORBA::ComponentIR::HomeDef *) _tao_servant; + static_cast<POA_CORBA::ComponentIR::HomeDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -19327,7 +19146,7 @@ void POA_CORBA::ComponentIR::HomeDef::_component_skel ( ) { POA_CORBA::ComponentIR::HomeDef *_tao_impl = - (POA_CORBA::ComponentIR::HomeDef *) _tao_object_reference; + static_cast<POA_CORBA::ComponentIR::HomeDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -19347,51 +19166,45 @@ CORBA::Boolean POA_CORBA::ComponentIR::HomeDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ExtInterfaceDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ComponentIR::HomeDef::_downcast ( @@ -19461,7 +19274,7 @@ const char* POA_CORBA::ComponentIR::HomeDef::_interface_repository_id (void) con } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ComponentIR::HomeDef::_dispatch ( TAO_ServerRequest &req, @@ -19476,7 +19289,7 @@ void POA_CORBA::ComponentIR::HomeDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ComponentIR::HomeDef * POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -19487,22 +19300,14 @@ POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h index 2b58ba3c950..f6b37b1b4c6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:390 -#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_H_ -#define _TAO_IDL_SERVER_IFR_COMPONENTSS_H_ +#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_H_ +#define _TAO_IDL_ORIG_IFR_COMPONENTSS_H_ #include /**/ "ace/pre.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp index d20a648982b..0652c1dcafc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:683 -#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_T_CPP_ -#define _TAO_IDL_SERVER_IFR_COMPONENTSS_T_CPP_ +#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_ +#define _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_ #include "IFR_ComponentsS_T.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h index 37921e2eb38..1de0d707030 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:546 -#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_T_H_ -#define _TAO_IDL_SERVER_IFR_COMPONENTSS_T_H_ +#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_T_H_ +#define _TAO_IDL_ORIG_IFR_COMPONENTSS_T_H_ #include /**/ "ace/pre.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp index b2fa906c681..dfc62782a32 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp @@ -29,12 +29,13 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:609 -#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_CPP_ -#define _TAO_IDL_SERVER_IFR_EXTENDEDS_CPP_ +#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_ +#define _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_ #include "IFR_ExtendedS.h" -#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/ForwardRequestC.h" #include "tao/PortableServer/Operation_Table.h" #include "tao/TAO_Server_Request.h" #include "tao/ORB_Core.h" @@ -70,20 +71,20 @@ #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 { // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:574 + // be\be_visitor_arg_traits.cpp:624 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_) #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::DefinitionKind> + class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind> : public Basic_Arg_Traits_T< CORBA::DefinitionKind @@ -145,13 +146,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::InterfaceDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq> : public Var_Size_Arg_Traits_T< CORBA::InterfaceDefSeq, @@ -181,13 +182,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:612 + // be\be_visitor_arg_traits.cpp:662 #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_SS_) #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ValueDef::FullValueDescription> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDef::FullValueDescription> : public Var_Size_Arg_Traits_T< CORBA::ValueDef::FullValueDescription, @@ -200,13 +201,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_) #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::InitializerSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq> : public Var_Size_Arg_Traits_T< CORBA::InitializerSeq, @@ -219,13 +220,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ValueDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq> : public Var_Size_Arg_Traits_T< CORBA::ValueDefSeq, @@ -238,13 +239,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:612 + // be\be_visitor_arg_traits.cpp:662 #if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_SS_) #define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription> : public Var_Size_Arg_Traits_T< CORBA::ExtValueDef::ExtFullValueDescription, @@ -257,13 +258,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_) #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ExtInitializerSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq> : public Var_Size_Arg_Traits_T< CORBA::ExtInitializerSeq, @@ -276,13 +277,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_) #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ExceptionDefSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq> : public Var_Size_Arg_Traits_T< CORBA::ExceptionDefSeq, @@ -295,13 +296,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:574 + // be\be_visitor_arg_traits.cpp:624 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_) #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::AttributeMode> + class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeMode> : public Basic_Arg_Traits_T< CORBA::AttributeMode @@ -346,13 +347,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:574 + // be\be_visitor_arg_traits.cpp:624 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_) #define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::OperationMode> + class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode> : public Basic_Arg_Traits_T< CORBA::OperationMode @@ -363,13 +364,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_) #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ParDescriptionSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq> : public Var_Size_Arg_Traits_T< CORBA::ParDescriptionSeq, @@ -382,13 +383,13 @@ namespace TAO #endif /* end #if !defined */ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:383 + // be\be_visitor_arg_traits.cpp:433 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_) #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_ ACE_TEMPLATE_SPECIALIZATION - class Arg_Traits<CORBA::ContextIdSeq> + class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq> : public Var_Size_Arg_Traits_T< CORBA::ContextIdSeq, @@ -450,7 +451,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_FixedDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -586,7 +587,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_digits_get : public TAO_ServerRequest public: TAO_ServerRequestInfo_CORBA_FixedDef_digits_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::FixedDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -639,7 +640,7 @@ private: TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::TAO_ServerRequestInfo_CORBA_FixedDef_digits_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::FixedDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -729,7 +730,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_digits_set : public TAO_ServerRequest public: TAO_ServerRequestInfo_CORBA_FixedDef_digits_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::FixedDef *tao_impl, const ::CORBA::UShort & digits ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -781,7 +782,7 @@ private: TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_FixedDef_digits_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::FixedDef *tao_impl, const ::CORBA::UShort & digits ACE_ENV_ARG_DECL_NOT_USED @@ -870,7 +871,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_scale_get : public TAO_ServerRequestI public: TAO_ServerRequestInfo_CORBA_FixedDef_scale_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::FixedDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -923,7 +924,7 @@ private: TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::TAO_ServerRequestInfo_CORBA_FixedDef_scale_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::FixedDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -1013,7 +1014,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_scale_set : public TAO_ServerRequestI public: TAO_ServerRequestInfo_CORBA_FixedDef_scale_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::FixedDef *tao_impl, const ::CORBA::Short & scale ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -1065,7 +1066,7 @@ private: TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_FixedDef_scale_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::FixedDef *tao_impl, const ::CORBA::Short & scale ACE_ENV_ARG_DECL_NOT_USED @@ -1200,7 +1201,7 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -1270,7 +1271,7 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -1456,9 +1457,9 @@ void POA_CORBA::FixedDef::_get_digits_skel ( CORBA::UShort _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -1601,9 +1602,9 @@ void POA_CORBA::FixedDef::_set_digits_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -1719,9 +1720,9 @@ void POA_CORBA::FixedDef::_get_scale_skel ( CORBA::Short _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -1864,9 +1865,9 @@ void POA_CORBA::FixedDef::_set_scale_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -1977,7 +1978,7 @@ void POA_CORBA::FixedDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::FixedDef *_tao_impl = - (POA_CORBA::FixedDef *) _tao_servant; + static_cast<POA_CORBA::FixedDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -2007,7 +2008,7 @@ void POA_CORBA::FixedDef::_non_existent_skel ( ) { POA_CORBA::FixedDef *_tao_impl = - (POA_CORBA::FixedDef *) _tao_servant; + static_cast<POA_CORBA::FixedDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -2040,7 +2041,7 @@ void POA_CORBA::FixedDef::_interface_skel ( } POA_CORBA::FixedDef *_tao_impl = - (POA_CORBA::FixedDef *) _tao_servant; + static_cast<POA_CORBA::FixedDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -2071,7 +2072,7 @@ void POA_CORBA::FixedDef::_component_skel ( ) { POA_CORBA::FixedDef *_tao_impl = - (POA_CORBA::FixedDef *) _tao_object_reference; + static_cast<POA_CORBA::FixedDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -2091,31 +2092,25 @@ CORBA::Boolean POA_CORBA::FixedDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/FixedDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::FixedDef::_downcast ( @@ -2155,7 +2150,7 @@ const char* POA_CORBA::FixedDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::FixedDef::_dispatch ( TAO_ServerRequest &req, @@ -2170,7 +2165,7 @@ void POA_CORBA::FixedDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::FixedDef * POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -2181,22 +2176,14 @@ POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -2223,7 +2210,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -2371,7 +2358,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueMemberDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -2424,7 +2411,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueMemberDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -2514,7 +2501,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get : public TAO_Serve public: TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueMemberDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -2567,7 +2554,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueMemberDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -2657,7 +2644,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set : public TAO_Serve public: TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueMemberDef *tao_impl, ::CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2709,7 +2696,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueMemberDef *tao_impl, ::CORBA::IDLType_ptr type_def ACE_ENV_ARG_DECL_NOT_USED @@ -2798,7 +2785,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueMemberDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -2851,7 +2838,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueMemberDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -2941,7 +2928,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueMemberDef *tao_impl, const ::CORBA::Visibility & access ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -2993,7 +2980,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueMemberDef *tao_impl, const ::CORBA::Visibility & access ACE_ENV_ARG_DECL_NOT_USED @@ -3128,7 +3115,7 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -3198,7 +3185,7 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -3410,9 +3397,9 @@ void POA_CORBA::ValueMemberDef::_get_type_skel ( CORBA::TypeCode_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -3545,9 +3532,9 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel ( ::CORBA::IDLType_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -3691,9 +3678,9 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -3809,9 +3796,9 @@ void POA_CORBA::ValueMemberDef::_get_access_skel ( CORBA::Visibility _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -3954,9 +3941,9 @@ void POA_CORBA::ValueMemberDef::_set_access_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -4067,7 +4054,7 @@ void POA_CORBA::ValueMemberDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ValueMemberDef *_tao_impl = - (POA_CORBA::ValueMemberDef *) _tao_servant; + static_cast<POA_CORBA::ValueMemberDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -4097,7 +4084,7 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel ( ) { POA_CORBA::ValueMemberDef *_tao_impl = - (POA_CORBA::ValueMemberDef *) _tao_servant; + static_cast<POA_CORBA::ValueMemberDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -4130,7 +4117,7 @@ void POA_CORBA::ValueMemberDef::_interface_skel ( } POA_CORBA::ValueMemberDef *_tao_impl = - (POA_CORBA::ValueMemberDef *) _tao_servant; + static_cast<POA_CORBA::ValueMemberDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -4161,7 +4148,7 @@ void POA_CORBA::ValueMemberDef::_component_skel ( ) { POA_CORBA::ValueMemberDef *_tao_impl = - (POA_CORBA::ValueMemberDef *) _tao_object_reference; + static_cast<POA_CORBA::ValueMemberDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -4181,31 +4168,25 @@ CORBA::Boolean POA_CORBA::ValueMemberDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ValueMemberDef::_downcast ( @@ -4245,7 +4226,7 @@ const char* POA_CORBA::ValueMemberDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ValueMemberDef::_dispatch ( TAO_ServerRequest &req, @@ -4260,7 +4241,7 @@ void POA_CORBA::ValueMemberDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ValueMemberDef * POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -4271,22 +4252,14 @@ POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -4313,7 +4286,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -4498,7 +4471,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get : public TAO public: TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -4551,7 +4524,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -4641,7 +4614,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set : public TAO public: TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -4693,7 +4666,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::InterfaceDefSeq & supported_interfaces ACE_ENV_ARG_DECL_NOT_USED @@ -4782,7 +4755,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -4835,7 +4808,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -4925,7 +4898,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::InitializerSeq & initializers ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -4977,7 +4950,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::InitializerSeq & initializers ACE_ENV_ARG_DECL_NOT_USED @@ -5066,7 +5039,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -5119,7 +5092,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -5209,7 +5182,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, ::CORBA::ValueDef_ptr base_value ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -5261,7 +5234,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, ::CORBA::ValueDef_ptr base_value ACE_ENV_ARG_DECL_NOT_USED @@ -5350,7 +5323,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO public: TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -5403,7 +5376,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -5493,7 +5466,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set : public TAO public: TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::ValueDefSeq & abstract_base_values ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -5545,7 +5518,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::ValueDefSeq & abstract_base_values ACE_ENV_ARG_DECL_NOT_USED @@ -5634,7 +5607,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ServerRe public: TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -5687,7 +5660,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -5777,7 +5750,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set : public TAO_ServerRe public: TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::Boolean & is_abstract ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -5829,7 +5802,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::Boolean & is_abstract ACE_ENV_ARG_DECL_NOT_USED @@ -5918,7 +5891,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ServerRequ public: TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -5971,7 +5944,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -6061,7 +6034,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set : public TAO_ServerRequ public: TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::Boolean & is_custom ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -6113,7 +6086,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::Boolean & is_custom ACE_ENV_ARG_DECL_NOT_USED @@ -6202,7 +6175,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_Serve public: TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -6255,7 +6228,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -6345,7 +6318,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set : public TAO_Serve public: TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::Boolean & is_truncatable ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -6397,7 +6370,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const ::CORBA::Boolean & is_truncatable ACE_ENV_ARG_DECL_NOT_USED @@ -6486,7 +6459,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_a : public TAO_ServerRequestInfo public: TAO_ServerRequestInfo_CORBA_ValueDef_is_a ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -6541,7 +6514,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_is_a ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const char * id ACE_ENV_ARG_DECL_NOT_USED @@ -6641,7 +6614,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_describe_value : public TAO_ServerReq public: TAO_ServerRequestInfo_CORBA_ValueDef_describe_value ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -6694,7 +6667,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::TAO_ServerRequestInfo_CORBA_ValueDef_describe_value ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -6784,7 +6757,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member : public TAO_Serv public: TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const char * id, const char * name, @@ -6847,7 +6820,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const char * id, const char * name, @@ -6971,7 +6944,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const char * id, const char * name, @@ -7034,7 +7007,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const char * id, const char * name, @@ -7158,7 +7131,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_create_operation : public TAO_ServerR public: TAO_ServerRequestInfo_CORBA_ValueDef_create_operation ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const char * id, const char * name, @@ -7227,7 +7200,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_CORBA_ValueDef_create_operation ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueDef *tao_impl, const char * id, const char * name, @@ -7415,7 +7388,7 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -7485,7 +7458,7 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -8082,9 +8055,9 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel ( ::CORBA::InterfaceDefSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -8228,9 +8201,9 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -8346,9 +8319,9 @@ void POA_CORBA::ValueDef::_get_initializers_skel ( ::CORBA::InitializerSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -8492,9 +8465,9 @@ void POA_CORBA::ValueDef::_set_initializers_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -8610,9 +8583,9 @@ void POA_CORBA::ValueDef::_get_base_value_skel ( ::CORBA::ValueDef_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -8756,9 +8729,9 @@ void POA_CORBA::ValueDef::_set_base_value_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -8874,9 +8847,9 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel ( ::CORBA::ValueDefSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9020,9 +8993,9 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9138,9 +9111,9 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel ( CORBA::Boolean _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9283,9 +9256,9 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9401,9 +9374,9 @@ void POA_CORBA::ValueDef::_get_is_custom_skel ( CORBA::Boolean _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9546,9 +9519,9 @@ void POA_CORBA::ValueDef::_set_is_custom_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9664,9 +9637,9 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel ( CORBA::Boolean _tao_retval = 0; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9809,9 +9782,9 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -9937,9 +9910,9 @@ void POA_CORBA::ValueDef::is_a_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10074,9 +10047,9 @@ void POA_CORBA::ValueDef::describe_value_skel ( ::CORBA::ValueDef::FullValueDescription_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10227,9 +10200,9 @@ void POA_CORBA::ValueDef::create_value_member_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10399,9 +10372,9 @@ void POA_CORBA::ValueDef::create_attribute_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10577,9 +10550,9 @@ void POA_CORBA::ValueDef::create_operation_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -10738,7 +10711,7 @@ void POA_CORBA::ValueDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ValueDef *_tao_impl = - (POA_CORBA::ValueDef *) _tao_servant; + static_cast<POA_CORBA::ValueDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -10768,7 +10741,7 @@ void POA_CORBA::ValueDef::_non_existent_skel ( ) { POA_CORBA::ValueDef *_tao_impl = - (POA_CORBA::ValueDef *) _tao_servant; + static_cast<POA_CORBA::ValueDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -10801,7 +10774,7 @@ void POA_CORBA::ValueDef::_interface_skel ( } POA_CORBA::ValueDef *_tao_impl = - (POA_CORBA::ValueDef *) _tao_servant; + static_cast<POA_CORBA::ValueDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -10832,7 +10805,7 @@ void POA_CORBA::ValueDef::_component_skel ( ) { POA_CORBA::ValueDef *_tao_impl = - (POA_CORBA::ValueDef *) _tao_object_reference; + static_cast<POA_CORBA::ValueDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -10852,39 +10825,33 @@ CORBA::Boolean POA_CORBA::ValueDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ValueDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ValueDef::_downcast ( @@ -10936,7 +10903,7 @@ const char* POA_CORBA::ValueDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ValueDef::_dispatch ( TAO_ServerRequest &req, @@ -10951,7 +10918,7 @@ void POA_CORBA::ValueDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ValueDef * POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -10962,22 +10929,14 @@ POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -11004,7 +10963,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -11193,7 +11152,7 @@ class TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get : public TAO_ public: TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExtValueDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -11246,7 +11205,7 @@ private: TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get::TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExtValueDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -11336,7 +11295,7 @@ class TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set : public TAO_ public: TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExtValueDef *tao_impl, const ::CORBA::ExtInitializerSeq & ext_initializers ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -11388,7 +11347,7 @@ private: TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set::TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExtValueDef *tao_impl, const ::CORBA::ExtInitializerSeq & ext_initializers ACE_ENV_ARG_DECL_NOT_USED @@ -11477,7 +11436,7 @@ class TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value : public TAO_Se public: TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExtValueDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -11530,7 +11489,7 @@ private: TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value::TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExtValueDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -11620,7 +11579,7 @@ class TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute : public TAO_ public: TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ExtValueDef *tao_impl, const char * id, const char * name, @@ -11687,7 +11646,7 @@ private: TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ExtValueDef *tao_impl, const char * id, const char * name, @@ -11869,7 +11828,7 @@ POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -11939,7 +11898,7 @@ POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -12135,9 +12094,9 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel ( ::CORBA::ExtInitializerSeq_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12281,9 +12240,9 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12399,9 +12358,9 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel ( ::CORBA::ExtValueDef::ExtFullValueDescription_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12556,9 +12515,9 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -12713,7 +12672,7 @@ void POA_CORBA::ExtValueDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ExtValueDef *_tao_impl = - (POA_CORBA::ExtValueDef *) _tao_servant; + static_cast<POA_CORBA::ExtValueDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -12743,7 +12702,7 @@ void POA_CORBA::ExtValueDef::_non_existent_skel ( ) { POA_CORBA::ExtValueDef *_tao_impl = - (POA_CORBA::ExtValueDef *) _tao_servant; + static_cast<POA_CORBA::ExtValueDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12776,7 +12735,7 @@ void POA_CORBA::ExtValueDef::_interface_skel ( } POA_CORBA::ExtValueDef *_tao_impl = - (POA_CORBA::ExtValueDef *) _tao_servant; + static_cast<POA_CORBA::ExtValueDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12807,7 +12766,7 @@ void POA_CORBA::ExtValueDef::_component_skel ( ) { POA_CORBA::ExtValueDef *_tao_impl = - (POA_CORBA::ExtValueDef *) _tao_object_reference; + static_cast<POA_CORBA::ExtValueDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -12827,43 +12786,37 @@ CORBA::Boolean POA_CORBA::ExtValueDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Container:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ValueDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ExtValueDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ExtValueDef::_downcast ( @@ -12921,7 +12874,7 @@ const char* POA_CORBA::ExtValueDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ExtValueDef::_dispatch ( TAO_ServerRequest &req, @@ -12936,7 +12889,7 @@ void POA_CORBA::ExtValueDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ExtValueDef * POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -12947,22 +12900,14 @@ POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); @@ -12989,7 +12934,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { @@ -13135,7 +13080,7 @@ class TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get : public TAO public: TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueBoxDef *tao_impl ACE_ENV_ARG_DECL_WITH_DEFAULTS ); @@ -13188,7 +13133,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueBoxDef *tao_impl ACE_ENV_ARG_DECL_NOT_USED ) @@ -13278,7 +13223,7 @@ class TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set : public TAO public: TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *tao_servant_upcall, POA_CORBA::ValueBoxDef *tao_impl, ::CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -13330,7 +13275,7 @@ private: TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set ( TAO_ServerRequest &_tao_server_request, - TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall, + TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall, POA_CORBA::ValueBoxDef *tao_impl, ::CORBA::IDLType_ptr original_type_def ACE_ENV_ARG_DECL_NOT_USED @@ -13465,7 +13410,7 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::dispatch ( ) ACE_THROW_SPEC ((CORBA::Exception)) { - TAO_Object_Adapter::Servant_Upcall servant_upcall ( + TAO::Portable_Server::Servant_Upcall servant_upcall ( obj->_stubobj ()->servant_orb_var ()->orb_core () ); @@ -13535,7 +13480,7 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::dispatch ( /////////////////////////////////////////////////////////////////////// // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:652 +// be\be_visitor_interface/interface_ss.cpp:640 TAO::Collocation_Proxy_Broker * CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr) @@ -13671,9 +13616,9 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel ( ::CORBA::IDLType_var _tao_retval; #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -13817,9 +13762,9 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel ( } #if (TAO_HAS_INTERCEPTORS == 1) - TAO_Object_Adapter::Servant_Upcall *_tao_upcall = + TAO::Portable_Server::Servant_Upcall *_tao_upcall = static_cast< - TAO_Object_Adapter::Servant_Upcall *> ( + TAO::Portable_Server::Servant_Upcall *> ( _tao_servant_upcall ); @@ -13930,7 +13875,7 @@ void POA_CORBA::ValueBoxDef::_is_a_skel ( TAO_InputCDR &_tao_in = _tao_server_request.incoming (); POA_CORBA::ValueBoxDef *_tao_impl = - (POA_CORBA::ValueBoxDef *) _tao_servant; + static_cast<POA_CORBA::ValueBoxDef *> (_tao_servant); CORBA::Boolean _tao_retval = 0; CORBA::String_var value; @@ -13960,7 +13905,7 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel ( ) { POA_CORBA::ValueBoxDef *_tao_impl = - (POA_CORBA::ValueBoxDef *) _tao_servant; + static_cast<POA_CORBA::ValueBoxDef *> (_tao_servant); CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -13993,7 +13938,7 @@ void POA_CORBA::ValueBoxDef::_interface_skel ( } POA_CORBA::ValueBoxDef *_tao_impl = - (POA_CORBA::ValueBoxDef *) _tao_servant; + static_cast<POA_CORBA::ValueBoxDef *> (_tao_servant); CORBA::InterfaceDef_ptr _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14024,7 +13969,7 @@ void POA_CORBA::ValueBoxDef::_component_skel ( ) { POA_CORBA::ValueBoxDef *_tao_impl = - (POA_CORBA::ValueBoxDef *) _tao_object_reference; + static_cast<POA_CORBA::ValueBoxDef *> (_tao_object_reference); CORBA::Object_var _tao_retval = _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -14044,39 +13989,33 @@ CORBA::Boolean POA_CORBA::ValueBoxDef::_is_a ( ACE_ENV_ARG_DECL_NOT_USED ) { - if ( + return + ( !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IRObject:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Contained:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/IDLType:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/TypedefDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/ValueBoxDef:1.0" ) || !ACE_OS::strcmp ( - (char *)value, + value, "IDL:omg.org/CORBA/Object:1.0" ) - ) - { - return 1; - } - else - { - return 0; - } + ); } void* POA_CORBA::ValueBoxDef::_downcast ( @@ -14128,7 +14067,7 @@ const char* POA_CORBA::ValueBoxDef::_interface_repository_id (void) const } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:588 +// be\be_visitor_interface/interface_ss.cpp:576 void POA_CORBA::ValueBoxDef::_dispatch ( TAO_ServerRequest &req, @@ -14143,7 +14082,7 @@ void POA_CORBA::ValueBoxDef::_dispatch ( } // TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:530 +// be\be_visitor_interface/interface_ss.cpp:527 CORBA::ValueBoxDef * POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL) @@ -14154,22 +14093,14 @@ POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL) TAO_Stub_Auto_Ptr safe_stub (stub); CORBA::Object_ptr tmp = CORBA::Object::_nil (); - if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ()) - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 1, this), - 0 - ); - } - else - { - ACE_NEW_RETURN ( - tmp, - CORBA::Object (stub, 0, this), - 0 - ); - } + CORBA::Boolean _tao_opt_colloc = + stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); + + ACE_NEW_RETURN ( + tmp, + CORBA::Object (stub, _tao_opt_colloc, this), + 0 + ); CORBA::Object_var obj = tmp; (void) safe_stub.release (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h index 2672e99b595..9887369feba 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:390 -#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_H_ -#define _TAO_IDL_SERVER_IFR_EXTENDEDS_H_ +#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_H_ +#define _TAO_IDL_ORIG_IFR_EXTENDEDS_H_ #include /**/ "ace/pre.h" @@ -58,101 +58,101 @@ namespace POA_CORBA { - - + + // TAO_IDL - Generated from // be\be_visitor_interface/interface_sh.cpp:87 - + class FixedDef; typedef FixedDef *FixedDef_ptr; - + class _TAO_FixedDef_ThruPOA_Proxy_Impl; class _TAO_FixedDef_Strategized_Proxy_Broker; - + class FixedDef : public virtual POA_CORBA::IDLType { protected: FixedDef (void); - + public: // Useful for template programming. typedef ::CORBA::FixedDef _stub_type; typedef ::CORBA::FixedDef_ptr _stub_ptr_type; typedef ::CORBA::FixedDef_var _stub_var_type; - + FixedDef (const FixedDef& rhs); virtual ~FixedDef (void); - + virtual CORBA::Boolean _is_a ( const char* logical_type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual void* _downcast ( const char* logical_type_id ); - + static void _is_a_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _non_existent_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _interface_skel ( TAO_ServerRequest &req, void *servant, void *servant_upcall ACE_ENV_ARG_DECL ); - + static void _component_skel ( TAO_ServerRequest &req, void *obj, void *servant_upcall ACE_ENV_ARG_DECL ); - + virtual void _dispatch ( TAO_ServerRequest &req, void *_servant_upcall ACE_ENV_ARG_DECL ); - + ::CORBA::FixedDef *_this ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 - + virtual CORBA::UShort digits ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void _get_digits_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 - + virtual void digits ( ::CORBA::UShort digits ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -160,34 +160,34 @@ namespace POA_CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void _set_digits_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 - + virtual CORBA::Short scale ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void _get_scale_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, void *_tao_servant_upcall ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 - + virtual void scale ( ::CORBA::Short scale ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -195,7 +195,7 @@ namespace POA_CORBA ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + static void _set_scale_skel ( TAO_ServerRequest &_tao_req, void *_tao_servant, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp index 4036f1695cf..a4e0504caff 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:683 -#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_T_CPP_ -#define _TAO_IDL_SERVER_IFR_EXTENDEDS_T_CPP_ +#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_ +#define _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_ #include "IFR_ExtendedS_T.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h index a956b073838..6f768189445 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h @@ -28,8 +28,8 @@ // TAO_IDL - Generated from // be\be_codegen.cpp:546 -#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_T_H_ -#define _TAO_IDL_SERVER_IFR_EXTENDEDS_T_H_ +#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_T_H_ +#define _TAO_IDL_ORIG_IFR_EXTENDEDS_T_H_ #include /**/ "ace/pre.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 504f63da55f..22ea6ddc455 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -11,9 +11,10 @@ #include "tao/IORTable/IORTable.h" #include "tao/ORB_Core.h" #include "tao/default_ports.h" -#include "tao/PortableServer/POA.h" +#include "tao/PortableServer/Root_POA.h" #include "tao/Stub.h" #include "tao/Profile.h" +#include "tao/ValueModifierC.h" #include "ace/Auto_Ptr.h" ACE_RCSID (IFR_Service, @@ -259,7 +260,7 @@ TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL) { delete heap; heap = 0; - + ACE_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("Error:: Opening persistent heap file '%s'\n"), @@ -1175,8 +1176,8 @@ TAO_IFR_Service_Utils::reference_to_path (CORBA::IRObject_ptr obj) PortableServer::ObjectId object_id; TAO::ObjectKey object_key = obj->_stubobj ()->profile_in_use ()->object_key (); - int status = TAO_POA::parse_ir_object_key (object_key, - object_id); + int status = TAO_Root_POA::parse_ir_object_key (object_key, + object_id); if (status != 0) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index e55e9ed930f..b59da5db26e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -24,7 +24,7 @@ #include /**/ "ace/pre.h" -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "ifr_service_export.h" @@ -58,37 +58,37 @@ public: /// Destructor. protected: - - int create_poa (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + /// Two persistent POAs, one using a servant locator. + int create_poa (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - int open_config (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Open an ACE_Configuration of the appropriate type. + int open_config (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - int create_repository (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Create and initialize the repository. + int create_repository (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - int init_multicast_server (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Enable the Interface Repository to answer multicast requests /// for its IOR. + int init_multicast_server (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - CORBA::ORB_var orb_; /// Reference to our ORB. + CORBA::ORB_var orb_; - PortableServer::POA_ptr root_poa_; /// Root POA reference. + PortableServer::POA_ptr root_poa_; - PortableServer::POA_ptr repo_poa_; /// The Repository's POA reference. + PortableServer::POA_ptr repo_poa_; - TAO_IOR_Multicast *ior_multicast_; /// Event handler that responds to multicast requests. + TAO_IOR_Multicast *ior_multicast_; - ACE_Configuration *config_; /// Database for the IFR. + ACE_Configuration *config_; - CORBA::String_var ifr_ior_; /// Interface Repository's IOR. + CORBA::String_var ifr_ior_; }; class TAO_IFR_Service_Utils @@ -97,53 +97,54 @@ public: TAO_IFR_Service_Utils (void); ~TAO_IFR_Service_Utils (void); - + typedef int (*name_clash_checker)(const char *); - static char *int_to_string (CORBA::ULong number); /// Convert the hex form of an 4-byte unsigned int to a string. + static char *int_to_string (CORBA::ULong number); /// The error-checking methods below all return void because /// they throw a spec-defined exception for every error case /// (specifically one of the BAD_PARAM minor versions). + /// Checks for illegal member type in given container type. static void valid_container (CORBA::DefinitionKind container_kind, CORBA::DefinitionKind contained_kind ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - /// Checks for illegal member type in given container type. + /// Wrapper for id_exists() and name_exists(). static void pre_exist (const char *id, name_clash_checker checker, ACE_Configuration_Section_Key &key, TAO_Repository_i *repo, CORBA::DefinitionKind kind ACE_ENV_ARG_DECL); - /// Wrapper for id_exists() and name_exists(). + /// Checks for a global repository id clash. static void id_exists (const char *id, TAO_Repository_i *repo ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - /// Checks for a global repository id clash. + /// Checks for a local name clash. static void name_exists (name_clash_checker checker, ACE_Configuration_Section_Key &key, TAO_Repository_i *repo, CORBA::DefinitionKind kind ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - /// Checks for a local name clash. + /// Used by interfaces and components to check for name clashes + /// in the attributes, operations, or component ports subsections. static void check_subsection (name_clash_checker checker, const char *sub_section, ACE_Configuration *config, ACE_Configuration_Section_Key &key ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - /// Used by interfaces and components to check for name clashes - /// in the attributes, operations, or component ports subsections. + /// Top-level method which calls all the above error-checking methods. static void valid_creation (CORBA::DefinitionKind container_kind, CORBA::DefinitionKind contained_kind, const char *id, @@ -151,8 +152,8 @@ public: ACE_Configuration_Section_Key &key, TAO_Repository_i *repo ACE_ENV_ARG_DECL); - /// Top-level method which calls all the above error-checking methods. + /// Code common to the creation of an entry for any non-anonymous type. static ACE_TString create_common ( CORBA::DefinitionKind container_kind, CORBA::DefinitionKind contained_kind, @@ -166,84 +167,83 @@ public: const char *sub_section_name ACE_ENV_ARG_DECL ); - /// Code common to the creation of an entry for any non-anonymous type. - + + /// Common to Container::create_value() and ValueDef::supported_interfaces(), + /// Container::create_component() and Component::supported_interfaces(). static void set_supported_interfaces ( const CORBA::InterfaceDefSeq &supported_interfaces, ACE_Configuration *config, ACE_Configuration_Section_Key &key ); - /// Common to Container::create_value() and ValueDef::supported_interfaces(), - /// Container::create_component() and Component::supported_interfaces(). + /// Common code for operations, attributes, and valuetype initializers. static void set_exceptions (ACE_Configuration *config, ACE_Configuration_Section_Key &key, const char *sub_section, const CORBA::ExceptionDefSeq &exceptions); - /// Common code for operations, attributes, and valuetype initializers. + /// Implemented here to avoid recursion in the servant classes. static CORBA::TypeCode_ptr gen_valuetype_tc_r ( ACE_Configuration_Section_Key &, TAO_Repository_i * ACE_ENV_ARG_DECL ); - /// Implemented here to avoid recursion in the servant classes. + /// Called from the above function. static void fill_valuemember_seq (CORBA::ValueMemberSeq &, ACE_Configuration_Section_Key &, TAO_Repository_i * ACE_ENV_ARG_DECL); - /// Called from the above function. - static char *reference_to_path (CORBA::IRObject_ptr obj); /// Converison from IR Object reference to key location path. + static char *reference_to_path (CORBA::IRObject_ptr obj); + /// Conversion from key location path to CORBA::DefinitionKind. static CORBA::DefinitionKind path_to_def_kind (ACE_TString &path, TAO_Repository_i *repo); - /// Conversion from key location path to CORBA::DefinitionKind. + /// Conversion from IR Object reference to CORBA::DefinitionKind. static CORBA::DefinitionKind reference_to_def_kind ( CORBA::IRObject_ptr obj, TAO_Repository_i *repo ); - /// Conversion from IR Object reference to CORBA::DefinitionKind. + /// Converion from key location path to IDLType. static TAO_IDLType_i *path_to_idltype (ACE_TString &path, TAO_Repository_i *repo); - /// Converion from key location path to IDLType. + /// Converion from key location path to IDLType. static TAO_Contained_i *path_to_contained (ACE_TString &path, TAO_Repository_i *repo); - /// Converion from key location path to IDLType. + /// Converion from key location path to IDLType. static TAO_Container_i *path_to_container (ACE_TString &path, TAO_Repository_i *repo); - /// Converion from key location path to IDLType. + /// Conversion from key location path to IR Object reference. static CORBA::Object_ptr path_to_ir_object (ACE_TString &path, TAO_Repository_i *repo ACE_ENV_ARG_DECL); - /// Conversion from key location path to IR Object reference. + /// Can be called from the above method or directly from a derived class. static CORBA::Object_ptr create_objref (CORBA::DefinitionKind def_kind, const char *obj_id, TAO_Repository_i *repo ACE_ENV_ARG_DECL); - /// Can be called from the above method or directly from a derived class. - static char *oid_to_string (PortableServer::ObjectId &oid); /// Copy and octet sequence to a string.. + static char *oid_to_string (PortableServer::ObjectId &oid); public: - static ACE_Configuration_Section_Key tmp_key_; /// To hold a key created by one method for another method to use. /// Calls to this class will be made after an IFR lock (if any) /// has been acquired, so thread safety is not an issue with this /// static variable. - - static TAO_Repository_i *repo_; - /// Needed by TAO_InterfaceDef_i::name_clash, probably can be used + static ACE_Configuration_Section_Key tmp_key_; + + /// Needed by TAO_InterfaceDef_i::name_clash, probably can be used /// all over the place now that it's here. + static TAO_Repository_i *repo_; }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index f5d6b529406..c598742583f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -6,7 +6,8 @@ #include "Contained_i.h" #include "IFR_Service_Utils.h" -#include "tao/PortableServer/POA.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/POA_Current_Impl.h" #include "tao/TSS_Resources.h" @@ -44,12 +45,13 @@ void TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_POA_Current_Impl *pc_impl = - static_cast<TAO_POA_Current_Impl *> (TAO_TSS_RESOURCES::instance ()->poa_current_impl_); + TAO::Portable_Server::POA_Current_Impl *pc_impl = + static_cast <TAO::Portable_Server::POA_Current_Impl *> + (TAO_TSS_RESOURCES::instance ()->poa_current_impl_); PortableServer::ObjectId object_id; - int status = TAO_POA::parse_ir_object_key (pc_impl->object_key (), - object_id); + int status = TAO_Root_POA::parse_ir_object_key (pc_impl->object_key (), + object_id); if (status != 0) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index f8f8126a2d9..75a6396abf2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -37,6 +37,7 @@ #include "IFR_macro.h" #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" #include "tao/CORBA_String.h" +#include "tao/PortableServer/PS_CurrentC.h" class IFR_Servant_Factory; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index e3c8ec41e17..3f2be9cd0f3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -66,7 +66,7 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::Location (this->location_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -121,7 +121,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) if (s == 0) ACE_THROW_RETURN (CORBA::NO_IMPLEMENT ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, errno), CORBA::COMPLETED_NO), 0); @@ -216,7 +216,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::LoadList (1), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index 6548995ed0d..24c8216a382 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -116,7 +116,7 @@ TAO_LB_CPU_Utilization_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::Location (this->location_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -140,7 +140,7 @@ TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::LoadList (1), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp index 809fe06b706..57e266921c3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp @@ -32,7 +32,7 @@ TAO_LB_ClientComponent::register_orb_initializer (void) TAO_LB_ClientORBInitializer, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp index 0a62009089e..4ab071fd528 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp @@ -26,7 +26,7 @@ TAO_LB_ClientORBInitializer::post_init ( TAO_LB_ClientRequestInterceptor, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp index 052001b11fa..fcba172bb61 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp @@ -108,7 +108,7 @@ TAO_LB_Component::register_orb_initializer ( location), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index c97b9d804db..5a5e40d8275 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -79,7 +79,7 @@ TAO_LB_IORInterceptor::components_established ( this->lm_.in ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 5a2131175f4..7c65cc62d62 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -67,7 +67,7 @@ TAO_LB_LeastLoaded::get_properties (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::Properties (this->properties_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 3bca0f64e9a..7c265729e45 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -65,7 +65,7 @@ TAO_LB_LoadAverage::get_properties (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::Properties (this->properties_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index 93e336d1f16..d30a2b159f1 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -148,7 +148,7 @@ TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location CosLoadBalancing::LoadList, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -882,7 +882,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor, TAO_LB_MemberLocator (this), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -987,7 +987,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor, TAO_LB_LoadAlert_Handler, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index cfc89538248..2b07ac94a75 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -66,7 +66,7 @@ TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::Properties (this->properties_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h index cf1b3530fcc..ccdc9af7247 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h @@ -22,13 +22,12 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/ServantLocatorC.h" #include "tao/LocalObject.h" // Forward declarations. class TAO_LB_LoadManager; - /** * @class TAO_LB_MemberLocator * diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp index 245fc0552b1..035486af6d3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp @@ -58,7 +58,7 @@ TAO_LB_ORBInitializer::post_init ( this->load_alert_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -76,7 +76,7 @@ TAO_LB_ORBInitializer::post_init ( TAO_LB_ServerRequestInterceptor (this->load_alert_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index b73c9045283..ff1f158b0e3 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -42,7 +42,7 @@ TAO_LB_Random::get_properties (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::Properties, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (props); @@ -146,7 +146,7 @@ TAO_LB_Random::_tao_next_member ( // Prevent integer arithmetic overflow. const CORBA::Float flen = static_cast<CORBA::Float> (len); - + const CORBA::ULong i = static_cast<CORBA::ULong> (flen * ACE_OS::rand () / (RAND_MAX + 1.0)); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index 6e8c1db4288..28507f0b1d6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -41,7 +41,7 @@ TAO_LB_RoundRobin::get_properties (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::Properties, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (props); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h index 4ba07961c82..e2bce0b2951 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h @@ -1,5 +1,6 @@ /* -*- C++ -*- */ // $Id$ + // ============================================================================ // // = LIBRARY @@ -18,6 +19,7 @@ #include /**/ "ace/pre.h" #include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/ServantActivatorC.h" #include "tao/LocalObject.h" #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index 1b350eced06..524bdb9821a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -268,7 +268,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request } break; - case TAO_DEFAULT_MINOR_CODE: + case TAO::VMCID: default: switch (ex.minor () & BITS_5_THRU_12_MASK) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp index 91a23f48ff6..0c24d0b14af 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp @@ -4,7 +4,7 @@ #include "Service.h" #include "ace/Dynamic_Service.h" -#include "tao/PortableServer/POA.h" +#include "tao/PortableServer/Root_POA.h" #include "tao/ORB_Core.h" CosNotifyChannelAdmin::EventChannelFactory_ptr @@ -20,7 +20,7 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC return notify_factory._retn (); } - TAO_POA *poa = default_POA->_tao_poa_downcast(); + TAO_Root_POA *poa = dynamic_cast <TAO_Root_POA*>(default_POA); if (poa == 0) return notify_factory._retn (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.idl b/TAO/orbsvcs/orbsvcs/PortableGroup.idl index ba592f8abcd..310952a767a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup.idl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup.idl @@ -11,6 +11,7 @@ #ifndef _PORTABLEGROUP_IDL_ #define _PORTABLEGROUP_IDL_ +#include "tao/PortableServer/PortableServer_include.pidl" #include "CosNaming.idl" #include "tao/IOP.pidl" #include "tao/GIOP.pidl" @@ -299,8 +300,24 @@ module PortableGroup in boolean is_primary); }; + exception NotAGroupObject {}; + typedef sequence <PortableServer::ObjectId> IDs; + local interface GOA : PortableServer::POA { + PortableServer::ObjectId create_id_for_reference(in Object the_ref) + raises (NotAGroupObject); + IDs reference_to_ids(in Object the_ref) + raises (NotAGroupObject); + + void associate_reference_with_id (in Object ref, + in PortableServer::ObjectId oid) + raises (NotAGroupObject); + + void disassociate_reference_with_id (in Object ref, + in PortableServer::ObjectId oid) + raises (NotAGroupObject); + }; }; // end PortableGroup #endif /* _PORTABLEGROUP_IDL_ */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp new file mode 100644 index 00000000000..f05d0f582f8 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -0,0 +1,713 @@ +#include "GOA.h" + +ACE_RCSID (PortableGroup, + GOA, + "$Id$") + +#include "tao/ORB_Core.h" +#include "tao/ORB.h" +#include "tao/Stub.h" +#include "tao/Tagged_Components.h" +#include "tao/Profile.h" +#include "tao/CDR.h" + +#include "ace/Auto_Ptr.h" + +#include "PortableGroup_Acceptor_Registry.h" +#include "PortableGroup_Request_Dispatcher.h" + +PortableServer::ObjectId * +TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableGroup::NotAGroupObject + )) +{ + // Get the RepositoryId from the Group reference so + // we know what kind of reference to make. + const char* repository_id = the_ref->_stubobj ()->type_id.in (); + + // Create a temporary object reference and then get the + // ObjectId out of it. + CORBA::Object_var obj_ref = this->create_reference (repository_id + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + PortableServer::ObjectId_var obj_id = this->reference_to_id (obj_ref.in () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + // Associate the object reference with the group reference. + this->associate_group_with_ref (the_ref, + obj_ref.in () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + return obj_id._retn (); +} + +PortableGroup::IDs * +TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref + ACE_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableGroup::NotAGroupObject + )) +{ + ACE_UNUSED_ARG (the_ref); + + return 0; +} + +void +TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableGroup::NotAGroupObject + )) +{ + // Create a reference for the specified ObjectId, since + // it is much easier to extract the object key from the + // reference. + CORBA::Object_var obj_ref = this->id_to_reference (oid + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + + // Associate the object reference with the group reference. + this->associate_group_with_ref (ref, + obj_ref.in () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +void +TAO_GOA::disassociate_reference_with_id (CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid + ACE_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableGroup::NotAGroupObject + )) +{ + ACE_UNUSED_ARG (ref); + ACE_UNUSED_ARG (oid); +} + + +TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name, + TAO_POA_Manager &poa_manager, + const TAO_POA_Policy_Set &policies, + 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_Regular_POA (name, + poa_manager, + policies, + parent, + lock, + thread_lock, + orb_core, + object_adapter + ACE_ENV_ARG_PARAMETER) +{ +} + +TAO_GOA::~TAO_GOA (void) +{ +} + +TAO_Root_POA * +TAO_GOA::new_POA (const String &name, + TAO_POA_Manager &poa_manager, + const TAO_POA_Policy_Set &policies, + 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_GOA *poa; + + ACE_NEW_THROW_EX (poa, + TAO_GOA (name, + poa_manager, + policies, + parent, + lock, + thread_lock, + orb_core, + object_adapter + ACE_ENV_ARG_PARAMETER), + CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN (0); + + return poa; +} + +// Standard POA interfaces +PortableServer::POA_ptr +TAO_GOA::create_POA (const char *adapter_name, + PortableServer::POAManager_ptr poa_manager, + const CORBA::PolicyList &policies + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterAlreadyExists, + PortableServer::POA::InvalidPolicy)) +{ + PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name, + poa_manager, + policies + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (poa); + return poa; +} + +PortableServer::POA_ptr +TAO_GOA::find_POA (const char *adapter_name, + CORBA::Boolean activate_it + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterNonExistent)) +{ + PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name, + activate_it + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (poa); + return poa; +} + +void +TAO_GOA::destroy (CORBA::Boolean etherealize_objects, + CORBA::Boolean wait_for_completion + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->TAO_Regular_POA::destroy (etherealize_objects, + wait_for_completion + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + + +#if (TAO_HAS_MINIMUM_POA == 0) + +PortableServer::ThreadPolicy_ptr +TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::ThreadPolicy_ptr policy = + this->TAO_Regular_POA::create_thread_policy (value + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (policy); + return policy; +} + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + +PortableServer::LifespanPolicy_ptr +TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::LifespanPolicy_ptr policy = + this->TAO_Regular_POA::create_lifespan_policy (value + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (policy); + return policy; +} + +PortableServer::IdUniquenessPolicy_ptr +TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::IdUniquenessPolicy_ptr policy = + this->TAO_Regular_POA::create_id_uniqueness_policy (value + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (policy); + return policy; +} + + +PortableServer::IdAssignmentPolicy_ptr +TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::IdAssignmentPolicy_ptr policy = + this->TAO_Regular_POA::create_id_assignment_policy (value + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (policy); + return policy; +} + + +#if (TAO_HAS_MINIMUM_POA == 0) + +PortableServer::ImplicitActivationPolicy_ptr +TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::ImplicitActivationPolicy_ptr policy = + this->TAO_Regular_POA::create_implicit_activation_policy (value + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (policy); + return policy; +} + +PortableServer::ServantRetentionPolicy_ptr +TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::ServantRetentionPolicy_ptr policy = + this->TAO_Regular_POA::create_servant_retention_policy (value + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (policy); + return policy; +} + + +PortableServer::RequestProcessingPolicy_ptr +TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::RequestProcessingPolicy_ptr policy = + this->TAO_Regular_POA::create_request_processing_policy (value + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (policy); + return policy; +} + + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + +char * +TAO_GOA::the_name (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + char * name = + this->TAO_Regular_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (name); + return name; +} + +PortableServer::POA_ptr +TAO_GOA::the_parent (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::POA_ptr parent = + this->TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (parent); + return parent; +} + +PortableServer::POAList * +TAO_GOA::the_children (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::POAList *children = + this->TAO_Regular_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (children); + return children; +} + +PortableServer::POAManager_ptr +TAO_GOA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::POAManager_ptr poa_manager = + this->TAO_Regular_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (poa_manager); + return poa_manager; +} + + +#if (TAO_HAS_MINIMUM_POA == 0) + +PortableServer::AdapterActivator_ptr +TAO_GOA::the_activator (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + PortableServer::AdapterActivator_ptr activator = + this->TAO_Regular_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (activator); + return activator; +} + +void +TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + this->TAO_Regular_POA::the_activator (adapter_activator + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +PortableServer::ServantManager_ptr +TAO_GOA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) +{ + PortableServer::ServantManager_ptr servant_manager = + this->TAO_Regular_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (servant_manager); + return servant_manager; +} + +void +TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) +{ + this->TAO_Regular_POA::set_servant_manager (imgr + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +PortableServer::Servant +TAO_GOA::get_servant (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::NoServant, + PortableServer::POA::WrongPolicy)) +{ + PortableServer::Servant servant = + this->TAO_Regular_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK_RETURN (servant); + return servant; +} + +void +TAO_GOA::set_servant (PortableServer::Servant servant + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) +{ + this->TAO_Regular_POA::set_servant (servant + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + +PortableServer::ObjectId * +TAO_GOA::activate_object (PortableServer::Servant p_servant + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::WrongPolicy)) +{ + PortableServer::ObjectId *object_id = + this->TAO_Regular_POA::activate_object (p_servant + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (object_id); + return object_id; +} + +void +TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id, + PortableServer::Servant p_servant + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::ObjectAlreadyActive, + PortableServer::POA::WrongPolicy)) +{ + this->TAO_Regular_POA::activate_object_with_id (id, + p_servant + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +void +TAO_GOA::deactivate_object (const PortableServer::ObjectId &oid + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)) +{ + this->TAO_Regular_POA::deactivate_object (oid + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; +} + +CORBA::Object_ptr +TAO_GOA::create_reference (const char *intf + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) +{ + CORBA::Object_ptr obj = + this->TAO_Regular_POA::create_reference (intf + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (obj); + return obj; +} + +CORBA::Object_ptr +TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid, + const char *intf + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + CORBA::Object_ptr obj = + this->TAO_Regular_POA::create_reference_with_id (oid, + intf + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (obj); + return obj; +} + +PortableServer::ObjectId * +TAO_GOA::servant_to_id (PortableServer::Servant p_servant + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)) +{ + PortableServer::ObjectId *object_id = + this->TAO_Regular_POA::servant_to_id (p_servant + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (object_id); + return object_id; +} + +CORBA::Object_ptr +TAO_GOA::servant_to_reference (PortableServer::Servant p_servant + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)) +{ + CORBA::Object_ptr obj = + this->TAO_Regular_POA::servant_to_reference (p_servant + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (obj); + return obj; +} + + +PortableServer::Servant +TAO_GOA::reference_to_servant (CORBA::Object_ptr reference + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongAdapter, + PortableServer::POA::WrongPolicy)) +{ + PortableServer::Servant servant = + this->TAO_Regular_POA::reference_to_servant (reference + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (servant); + return servant; +} + +PortableServer::ObjectId * +TAO_GOA::reference_to_id (CORBA::Object_ptr reference + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongAdapter, + PortableServer::POA::WrongPolicy)) +{ + PortableServer::ObjectId *object_id = + this->TAO_Regular_POA::reference_to_id (reference + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (object_id); + return object_id; +} + +PortableServer::Servant +TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)) +{ + PortableServer::Servant servant = + this->TAO_Regular_POA::id_to_servant (oid + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (servant); + return servant; +} + +CORBA::Object_ptr +TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)) +{ + CORBA::Object_ptr obj = + this->TAO_Regular_POA::id_to_reference (oid + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (obj); + return obj; +} + +CORBA::OctetSeq * +TAO_GOA::id (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER); +} + +int +TAO_GOA::find_group_component (const CORBA::Object_ptr the_ref, + PortableGroup::TagGroupTaggedComponent &group) +{ + const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles (); + const TAO_Profile* profile; + CORBA::ULong slot; + + // Iterate through the tagged profiles, and + // create acceptors for the multicast ones. + slot = 0; + while ((profile = profiles.get_profile (slot))) + { + if (this->find_group_component_in_profile (profile, group) == 0) + return 0; + + ++slot; + } + + // Not found. + return -1; +} + +int +TAO_GOA::find_group_component_in_profile (const TAO_Profile* profile, + PortableGroup::TagGroupTaggedComponent &group) +{ + // Iterate through the tagged components looking for + // group tag. + const TAO_Tagged_Components& components = profile->tagged_components (); + + IOP::TaggedComponent tagged_component; + tagged_component.tag = IOP::TAG_GROUP; + + // Try to find it. + if (components.get_component (tagged_component) == 0) + return -1; + + // Found it. + const CORBA::Octet *buf = + tagged_component.component_data.get_buffer (); + + TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf), + tagged_component.component_data.length ()); + + // Extract the Byte Order. + CORBA::Boolean byte_order; + if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) + return -1; + in_cdr.reset_byte_order (ACE_static_cast(int, byte_order)); + + if ((in_cdr >> group) == 0) + return -1; + + return 0; +} + +int +TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref, + TAO_PortableGroup_Acceptor_Registry &acceptor_registry, + TAO_ORB_Core &orb_core + ACE_ENV_ARG_DECL) +{ + const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles (); + const TAO_Profile* profile; + CORBA::ULong slot; + int num = 0; + + // Iterate through the tagged profiles, and + // create acceptors for the multicast ones. + slot = 0; + while ((profile = profiles.get_profile (slot))) + { + if (profile->supports_multicast ()) + { + acceptor_registry.open (profile, + orb_core + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + ++num; + } + + ++slot; + } + + // Return the number of acceptors registered. + return num; +} + +void +TAO_GOA::associate_group_with_ref ( + CORBA::Object_ptr group_ref, + CORBA::Object_ptr obj_ref + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableGroup::NotAGroupObject)) +{ + // Find the Group Component so that we can extract the Group ID. + PortableGroup::TagGroupTaggedComponent *tmp_group_id; + ACE_NEW_THROW_EX (tmp_group_id, + PortableGroup::TagGroupTaggedComponent, + CORBA::NO_MEMORY ( + CORBA::SystemException::_tao_minor_code ( + TAO::VMCID, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK; + + PortableGroup::TagGroupTaggedComponent_var group_id = tmp_group_id; + + if (this->find_group_component (group_ref, group_id.inout ()) != 0) + { + // Group component wasn't found. The group reference + // that was passed in must be bogus. + ACE_THROW (PortableGroup::NotAGroupObject ()); + } + + PortableGroup_Request_Dispatcher *rd = + dynamic_cast <PortableGroup_Request_Dispatcher*>( + this->orb_core_.request_dispatcher()); + + // Create the acceptors necessary to receive requests for the + // specified group reference. + this->create_group_acceptors (group_ref, + rd->acceptor_registry_, + this->orb_core_ + ACE_ENV_ARG_PARAMETER); + + ACE_CHECK; + + + // Add a mapping from GroupId to Object key in the PortableGroup + const TAO::ObjectKey &key = + obj_ref->_stubobj ()->profile_in_use ()->object_key (); + rd->group_map_.add_groupid_objectkey_pair (group_id._retn (), + key + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; + +} + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) + +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + + diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h new file mode 100644 index 00000000000..b1e08712f4e --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h @@ -0,0 +1,325 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file GOA.h + * + * $Id$ + * + * Header file for Group Object Adapter + * + * @author Several + */ +//============================================================================= + +#ifndef TAO_GOA_H +#define TAO_GOA_H + +#include /**/ "ace/pre.h" + +#include "portablegroup_export.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/PortableServer/Regular_POA.h" +#include "orbsvcs/PortableGroupC.h" + +// This is to remove "inherits via dominance" warnings from MSVC. +// MSVC is being a little too paranoid. +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + +class TAO_Profile; +class TAO_PortableGroup_Acceptor_Registry; + +/** + * @class TAO_GOA + * + * @brief Implementation of the PortableGroup::GOA interface. + * + * Implementation of the PortableGroup::GOA interface. + */ +class TAO_PortableGroup_Export TAO_GOA : + public virtual PortableGroup::GOA, + public virtual TAO_Regular_POA +{ +public: + // Methods added by the + /// @name MIOP specification methods + //@{ + virtual PortableServer::ObjectId * create_id_for_reference ( + CORBA::Object_ptr the_ref + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableGroup::NotAGroupObject + )); + + + virtual PortableGroup::IDs * reference_to_ids ( + CORBA::Object_ptr the_ref + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableGroup::NotAGroupObject + )); + + virtual void associate_reference_with_id ( + CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableGroup::NotAGroupObject + )); + + virtual void disassociate_reference_with_id ( + CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableGroup::NotAGroupObject + )); + //@} + + // Standard POA interface methods + PortableServer::POA_ptr create_POA (const char *adapter_name, + PortableServer::POAManager_ptr poa_manager, + const CORBA::PolicyList &policies + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterAlreadyExists, + PortableServer::POA::InvalidPolicy)); + + PortableServer::POA_ptr find_POA (const char *adapter_name, + CORBA::Boolean activate_it + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterNonExistent)); + + void destroy (CORBA::Boolean etherealize_objects, + CORBA::Boolean wait_for_completion + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + +#if (TAO_HAS_MINIMUM_POA == 0) + + PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + + PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + +#if (TAO_HAS_MINIMUM_POA == 0) + + PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + + char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + +#if (TAO_HAS_MINIMUM_POA == 0) + + PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + void the_activator (PortableServer::AdapterActivator_ptr adapter_activator + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); + + void set_servant_manager (PortableServer::ServantManager_ptr imgr + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); + + PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::NoServant, + PortableServer::POA::WrongPolicy)); + + void set_servant (PortableServer::Servant servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + + PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::WrongPolicy)); + + void activate_object_with_id (const PortableServer::ObjectId &id, + PortableServer::Servant p_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::ObjectAlreadyActive, + PortableServer::POA::WrongPolicy)); + + void deactivate_object (const PortableServer::ObjectId &oid + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)); + + CORBA::Object_ptr create_reference (const char *intf + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); + + 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::ObjectId *servant_to_id (PortableServer::Servant p_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)); + + CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)); + + PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongAdapter, + PortableServer::POA::WrongPolicy)); + + PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongAdapter, + PortableServer::POA::WrongPolicy)); + + PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)); + + CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid + ACE_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)); + + CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC ((CORBA::SystemException)); + + // End standard POA interface methods. + + TAO_GOA (const String &name, + TAO_POA_Manager &poa_manager, + const TAO_POA_Policy_Set &policies, + 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); + + virtual ~TAO_GOA (void); + + // Used to force the initialization of the code. + static int Initializer (void); + +protected: + + /// Template method for creating new POA's of this type. + virtual TAO_Root_POA *new_POA (const String &name, + TAO_POA_Manager &poa_manager, + const TAO_POA_Policy_Set &policies, + 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); + + int find_group_component (const CORBA::Object_ptr the_ref, + PortableGroup::TagGroupTaggedComponent &group); + + int find_group_component_in_profile ( + const TAO_Profile* profile, + PortableGroup::TagGroupTaggedComponent &group + ); + + int create_group_acceptors ( + CORBA::Object_ptr the_ref, + TAO_PortableGroup_Acceptor_Registry &acceptor_registry, + TAO_ORB_Core &orb_core + ACE_ENV_ARG_DECL + ); + + /// Helper function to associate group references with + /// object references. + void associate_group_with_ref ( + CORBA::Object_ptr group_ref, + CORBA::Object_ptr obj_ref + ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableGroup::NotAGroupObject)); +}; + +// **************************************************************** + +#if defined(_MSC_VER) +#pragma warning(pop) +#endif /* _MSC_VER */ + +#include /**/ "ace/post.h" + +#endif /* TAO_GOA_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp index 41daec0ca8b..8148eff7164 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp @@ -2,6 +2,7 @@ #include "UIPMC_Factory.h" #include "ace/Service_Config.h" #include "PortableGroup_Loader.h" +#include "PG_Object_Adapter_Factory.h" ACE_RCSID (PortableGroup, UIPMC_Factory, @@ -12,9 +13,12 @@ namespace TAO /*static*/ int MIOP_Loader::Initializer (void) { - /*ACE_Service_Config::process_directive ( + ACE_Service_Config::process_directive ( ace_svc_desc_TAO_PortableGroup_Loader); - */ + + ACE_Service_Config::process_directive ( + ace_svc_desc_TAO_PG_Object_Adapter_Factory); + return ACE_Service_Config::process_directive ( ace_svc_desc_TAO_UIPMC_Protocol_Factory); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index 1ab07283025..34567542613 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -9,7 +9,7 @@ #include "ace/OS_NS_unistd.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/PortableServer/POAManagerC.h" #include "PG_Operators.h" // operator == on CosNaming::Name // Use this macro at the beginning of CORBA methods @@ -640,7 +640,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( // allocate stucture to be returned. PortableGroup::FactoryInfos_var result = 0; ACE_NEW_THROW_EX (result, ::PortableGroup::FactoryInfos(), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -671,7 +671,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( METHOD_ENTRY(TAO::PG_FactoryRegistry::list_factories_by_location); ::PortableGroup::FactoryInfos_var result; ACE_NEW_THROW_EX (result, ::PortableGroup::FactoryInfos(this->registry_.current_size()), - CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index f0da337d804..1a9c5f8b23f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -165,7 +165,7 @@ TAO_PG_GenericFactory::create_object ( PortableGroup::GenericFactory::FactoryCreationId, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index d9f3e51eaea..46e3d06b648 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -23,7 +23,7 @@ #include "ace/Hash_Map_Manager.h" #include "portablegroup_export.h" -#include "tao/PortableServer/PortableServerC.h" +#include "tao/PortableServer/PortableServer.h" #include "orbsvcs/PortableGroupC.h" #include "PG_Object_Group_Manipulator.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 39b65b8768b..9dbc38d7ad8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -204,7 +204,7 @@ TAO_PG_ObjectGroupManager::add_member_i ( TAO_PG_ObjectGroup_Array, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -260,7 +260,7 @@ TAO_PG_ObjectGroupManager::remove_member ( // Multiple members from different object groups may reside at the // same location. Iterate through the list to attempt to find a - // match for the exact object group. + // match for the exact object group. size_t to_be_removed = 0; // get the position of the object group in the object_group_array @@ -335,7 +335,7 @@ TAO_PG_ObjectGroupManager::locations_of_members ( PortableGroup::Locations, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -514,8 +514,8 @@ TAO_PG_ObjectGroupManager::get_object_group_ref_from_id ( this->lock_, PortableGroup::ObjectGroup::_nil ()); - if (this->object_group_map_.find (ACE_U64_TO_U32 (group_id), - group_entry) + if (this->object_group_map_.find (ACE_U64_TO_U32 (group_id), + group_entry) != 0) { ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (), @@ -554,7 +554,7 @@ TAO_PG_ObjectGroupManager::create_object_group ( TAO_PG_ObjectGroup_Map_Entry, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -680,7 +680,7 @@ TAO_PG_ObjectGroupManager::get_properties ( PortableGroup::Properties, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp new file mode 100644 index 00000000000..30727bb8e75 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp @@ -0,0 +1,46 @@ +// $Id$ + +#include "PG_Object_Adapter_Factory.h" +#include "PG_Servant_Dispatcher.h" + +#include "tao/PortableServer/Object_Adapter.h" +#include "tao/ORB_Core.h" + +ACE_RCSID (TAO_PortableGroup, + PG_Object_Adapter_Factory, + "$Id$") + + +TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void) +{ +} + +TAO_Adapter* +TAO_PG_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core) +{ + TAO_Object_Adapter *object_adapter = 0; + ACE_NEW_RETURN (object_adapter, + TAO_Object_Adapter (orb_core->server_factory ()-> + active_object_map_creation_parameters (), + *orb_core), + 0); + + // Create and register the RT servant dispatcher. + TAO_PG_Servant_Dispatcher *rt_servant_dispatcher; + ACE_NEW_RETURN (rt_servant_dispatcher, + TAO_PG_Servant_Dispatcher, + 0); + object_adapter->servant_dispatcher (rt_servant_dispatcher); + + + return object_adapter; +} + +ACE_FACTORY_DEFINE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory) +ACE_STATIC_SVC_DEFINE (TAO_PG_Object_Adapter_Factory, + ACE_TEXT ("TAO_GOA"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (TAO_PG_Object_Adapter_Factory), + ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, + 0) + diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h new file mode 100644 index 00000000000..189d77873a8 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h @@ -0,0 +1,42 @@ +/* -*- C++ -*- */ +//============================================================================= +/** + * @file PG_Object_Adapter_Factory.h + * + * $Id$ + * + * @author Johnny Willemsen + */ +// =================================================================== + +#ifndef TAO_PG_OBJECT_ADAPTER_FACTORY_H +#define TAO_PG_OBJECT_ADAPTER_FACTORY_H +#include /**/ "ace/pre.h" + +#include "portablegroup_export.h" + +#include "tao/PortableServer/Object_Adapter_Factory.h" +#include "tao/orbconf.h" + +#include "ace/Service_Config.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class TAO_PortableGroup_Export TAO_PG_Object_Adapter_Factory : public TAO_Object_Adapter_Factory +{ +public: + /// Constructor + TAO_PG_Object_Adapter_Factory (void); + + /// Create adapter. + virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); +}; + +ACE_STATIC_SVC_DECLARE (TAO_PG_Object_Adapter_Factory) +ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory) + +#include /**/ "ace/post.h" + +#endif /* TAO_PG_OBJECT_ADAPTER_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 825572e1f5c..d00480c4dd4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -6,7 +6,6 @@ #include "PG_Operators.h" // Borrow operator== on CosNaming::Name #include "PG_Utils.h" -#include "tao/PortableServer/ORB_Manager.h" #include "tao/debug.h" #include "ace/Get_Opt.h" diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp index abab2a89e0a..46d1380f826 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp @@ -70,7 +70,7 @@ TAO_PG_PropertyManager::get_default_properties ( PortableGroup::Properties (this->default_properties_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -154,7 +154,7 @@ TAO_PG_PropertyManager::get_type_properties ( PortableGroup::Properties (props_len), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -290,7 +290,7 @@ TAO_PG_PropertyManager::get_properties ( PortableGroup::Properties (properties_len), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp new file mode 100644 index 00000000000..67958aa2bbf --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp @@ -0,0 +1,63 @@ +// @(#) $Id$ + +#include "PG_Servant_Dispatcher.h" +#include "GOA.h" + +ACE_RCSID(PortableGroup, + PG_Servant_Dispatcher, + "$Id$") + +TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void) +{ +} + +TAO_Root_POA * +TAO_PG_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_Root_POA *poa = 0; + + ACE_NEW_THROW_EX (poa, + TAO_GOA (name, + poa_manager, + policies, + 0, + lock, + thread_lock, + orb_core, + object_adapter + ACE_ENV_ARG_PARAMETER), + CORBA::NO_MEMORY ()); + ACE_CHECK_RETURN (0); + + return poa; +} + +void +TAO_PG_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_PG_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_PG_Servant_Dispatcher::post_invoke (TAO_Root_POA &, + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &) +{ +} diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h new file mode 100644 index 00000000000..2c40bef8cd3 --- /dev/null +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h @@ -0,0 +1,68 @@ +/* -*- C++ -*- */ + +//============================================================================= +/** + * @file PG_Servant_Dispatcher.h + * + * $Id$ + * + * @author Johnny Willemsen <jwillemsen@remedy.nl> + */ +//============================================================================= + +#ifndef TAO_PG_SERVANT_DISPATCHER_H +#define TAO_PG_SERVANT_DISPATCHER_H +#include /**/ "ace/pre.h" + +#include "portablegroup_export.h" +#include "tao/PortableServer/Servant_Dispatcher.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +/** + * @class TAO_PG_Servant_Dispatcher + * + * @brief Concrete instantiation of the Servant_Dispatcher strategy. + * + * This class just calls _dispatch on the servant_upcall. No extra + * processing is done or needed. + * + */ +class TAO_PortableGroup_Export TAO_PG_Servant_Dispatcher + : public TAO_Servant_Dispatcher +{ +public: + virtual ~TAO_PG_Servant_Dispatcher (void); + + /// Pre_invoke remote request. + void pre_invoke_remote_request (TAO_Root_POA &poa, + CORBA::Short servant_priority, + TAO_ServerRequest &req, + 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_Root_POA &poa, + CORBA::Short servant_priority, + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state + ACE_ENV_ARG_DECL); + + /// Post_invoke request. + 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_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); +}; + +#include /**/ "ace/post.h" +#endif /* TAO_PG_SERVANT_DISPATCHER_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp deleted file mode 100644 index fdde0eed0ce..00000000000 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp +++ /dev/null @@ -1,255 +0,0 @@ -#include "POA_Hooks.h" -#include "PortableGroup_Loader.h" -#include "PortableGroup_Request_Dispatcher.h" - -#include "tao/Stub.h" -#include "tao/Profile.h" -#include "tao/ORB_Constants.h" -#include "tao/CDR.h" - -ACE_RCSID (PortableGroup, - POA_Hooks, - "$Id$") - -TAO_POA_Hooks::TAO_POA_Hooks ( - PortableGroup_Request_Dispatcher &request_dispatcher) - : request_dispatcher_ (request_dispatcher) -{ -} - -TAO_POA_Hooks::~TAO_POA_Hooks (void) -{ -} - -#if (TAO_HAS_MINIMUM_POA == 0) - -PortableServer::ObjectId * -TAO_POA_Hooks::create_id_for_reference ( - TAO_POA &the_poa, - CORBA::Object_ptr the_ref - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject - )) -{ - - // Get the RepositoryId from the Group reference so - // we know what kind of reference to make. - const char* repository_id = the_ref->_stubobj ()->type_id.in (); - - // Create a temporary object reference and then get the - // ObjectId out of it. - CORBA::Object_var obj_ref = the_poa.create_reference (repository_id - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - PortableServer::ObjectId_var obj_id = the_poa.reference_to_id (obj_ref.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - // Associate the object reference with the group reference. - this->associate_group_with_ref (the_poa, - the_ref, - obj_ref.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - return obj_id._retn (); -} - -int -TAO_POA_Hooks::find_group_component (const CORBA::Object_ptr the_ref, - PortableGroup::TagGroupTaggedComponent &group) -{ - const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles (); - const TAO_Profile* profile; - CORBA::ULong slot; - - // Iterate through the tagged profiles, and - // create acceptors for the multicast ones. - slot = 0; - while ((profile = profiles.get_profile (slot))) - { - if (this->find_group_component_in_profile (profile, group) == 0) - return 0; - - ++slot; - } - - // Not found. - return -1; -} - -int -TAO_POA_Hooks::find_group_component_in_profile (const TAO_Profile* profile, - PortableGroup::TagGroupTaggedComponent &group) -{ - // Iterate through the tagged components looking for - // group tag. - const TAO_Tagged_Components& components = profile->tagged_components (); - - IOP::TaggedComponent tagged_component; - tagged_component.tag = IOP::TAG_GROUP; - - // Try to find it. - if (components.get_component (tagged_component) == 0) - return -1; - - // Found it. - const CORBA::Octet *buf = - tagged_component.component_data.get_buffer (); - - TAO_InputCDR in_cdr (reinterpret_cast<const char*> (buf), - tagged_component.component_data.length ()); - - // Extract the Byte Order. - CORBA::Boolean byte_order; - if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) - return -1; - in_cdr.reset_byte_order (static_cast<int> (byte_order)); - - if ((in_cdr >> group) == 0) - return -1; - - return 0; -} - -int -TAO_POA_Hooks::create_group_acceptors (CORBA::Object_ptr the_ref, - TAO_PortableGroup_Acceptor_Registry &acceptor_registry, - TAO_ORB_Core &orb_core - ACE_ENV_ARG_DECL) -{ - const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles (); - const TAO_Profile* profile; - CORBA::ULong slot; - int num = 0; - - // Iterate through the tagged profiles, and - // create acceptors for the multicast ones. - slot = 0; - while ((profile = profiles.get_profile (slot))) - { - if (profile->supports_multicast ()) - { - acceptor_registry.open (profile, - orb_core - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - ++num; - } - - ++slot; - } - - // Return the number of acceptors registered. - return num; -} - - -PortableServer::IDs * -TAO_POA_Hooks::reference_to_ids ( - TAO_POA &/*the_poa*/, - CORBA::Object_ptr /*the_ref*/ - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject - )) -{ - - return 0; -} - -void -TAO_POA_Hooks::associate_group_with_ref ( - TAO_POA &the_poa, - CORBA::Object_ptr group_ref, - CORBA::Object_ptr obj_ref - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::NotAGroupObject)) -{ - // Find the Group Component so that we can extract the Group ID. - PortableGroup::TagGroupTaggedComponent *tmp_group_id; - ACE_NEW_THROW_EX (tmp_group_id, - PortableGroup::TagGroupTaggedComponent, - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_CHECK; - - PortableGroup::TagGroupTaggedComponent_var group_id = tmp_group_id; - - if (this->find_group_component (group_ref, group_id.inout ()) != 0) - { - // Group component wasn't found. The group reference - // that was passed in must be bogus. - ACE_THROW (PortableServer::NotAGroupObject ()); - } - - // Create the acceptors necessary to receive requests for the - // specified group reference. - this->create_group_acceptors (group_ref, - this->request_dispatcher_.acceptor_registry_, - the_poa.orb_core () - ACE_ENV_ARG_PARAMETER); - - ACE_CHECK; - - - // Add a mapping from GroupId to Object key in the PortableGroup - const TAO::ObjectKey &key = - obj_ref->_stubobj ()->profile_in_use ()->object_key (); - this->request_dispatcher_.group_map_.add_groupid_objectkey_pair ( - group_id._retn (), - key - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - -} - -void -TAO_POA_Hooks::associate_reference_with_id ( - TAO_POA &the_poa, - CORBA::Object_ptr ref, - const PortableServer::ObjectId & oid - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject - )) -{ - - // Create a reference for the specified ObjectId, since - // it is much easier to extract the object key from the - // reference. - CORBA::Object_var obj_ref = the_poa.id_to_reference (oid - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - // Associate the object reference with the group reference. - this->associate_group_with_ref (the_poa, - ref, - obj_ref.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} - -void -TAO_POA_Hooks::disassociate_reference_with_id ( - TAO_POA &/*the_poa*/, - CORBA::Object_ptr /*ref*/, - const PortableServer::ObjectId & /*oid*/ - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject - )) -{ -} - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h deleted file mode 100644 index f1bb0a0dadf..00000000000 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h +++ /dev/null @@ -1,135 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file POA_Hooks.h - * - * $Id$ - * - * @author Frank Hunleth <fhunleth@cs.wustl.edu> - */ -//============================================================================= - -#ifndef TAO_POA_HOOKS_H -#define TAO_POA_HOOKS_H - -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/PortableGroup_Hooks.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "portablegroup_export.h" - -#include "orbsvcs/PortableGroupC.h" - -// Forward references -class PortableGroup_Request_Dispatcher; -class TAO_PortableGroup_Loader; -class TAO_Profile; -class TAO_PortableGroup_Acceptor_Registry; - -/** - * @class TAO_POA_Hooks - * - * @brief TAO_POA_Hooks - * - * This class acts as a facade for all of the POA specific methods in the - * PortableGroup library. - */ -class TAO_PortableGroup_Export TAO_POA_Hooks : - public TAO_POA_PortableGroup_Hooks -{ -public: - TAO_POA_Hooks (PortableGroup_Request_Dispatcher &request_dispatcher); - - virtual ~TAO_POA_Hooks (void); - -#if (TAO_HAS_MINIMUM_POA == 0) - - virtual PortableServer::ObjectId * create_id_for_reference ( - TAO_POA &the_poa, - CORBA::Object_ptr the_ref - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject - )); - - virtual PortableServer::IDs * reference_to_ids ( - TAO_POA &the_poa, - CORBA::Object_ptr the_ref - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject - )); - - virtual void associate_reference_with_id ( - TAO_POA &the_poa, - CORBA::Object_ptr ref, - const PortableServer::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject - )); - - virtual void disassociate_reference_with_id ( - TAO_POA &the_poa, - CORBA::Object_ptr ref, - const PortableServer::ObjectId & oid - ACE_ENV_ARG_DECL_WITH_DEFAULTS - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableServer::NotAGroupObject - )); - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - -protected: - -#if (TAO_HAS_MINIMUM_POA == 0) - - int find_group_component (const CORBA::Object_ptr the_ref, - PortableGroup::TagGroupTaggedComponent &group); - - int find_group_component_in_profile ( - const TAO_Profile* profile, - PortableGroup::TagGroupTaggedComponent &group - ); - - int create_group_acceptors ( - CORBA::Object_ptr the_ref, - TAO_PortableGroup_Acceptor_Registry &acceptor_registry, - TAO_ORB_Core &orb_core - ACE_ENV_ARG_DECL - ); - - /// Helper function to associate group references with - /// object references. - void associate_group_with_ref ( - TAO_POA &the_poa, - CORBA::Object_ptr group_ref, - CORBA::Object_ptr obj_ref - ACE_ENV_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::NotAGroupObject)); - -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - -private: - - PortableGroup_Request_Dispatcher &request_dispatcher_; - -}; - -#include /**/ "ace/post.h" - -#endif /* TAO_POA_HOOKS_H */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index 234c493816d..ce639bbf3ec 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -3,6 +3,7 @@ // $Id$ #include "PortableGroup_Loader.h" +#include "PG_Object_Adapter_Factory.h" #include "PortableGroup_ORBInitializer.h" #include "ace/Dynamic_Service.h" #include "tao/ORB_Core.h" @@ -27,12 +28,12 @@ TAO_PortableGroup_Loader::init (int /*argc*/, PortableInterceptor::ORBInitializer::_nil (); PortableInterceptor::ORBInitializer_var orb_initializer; - /// Register the RTCORBA ORBInitializer. + /// Register the Portablegroup ORBInitializer. ACE_NEW_THROW_EX (temp_orb_initializer, TAO_PortableGroup_ORBInitializer (), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h index d322948b490..a528c515277 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h @@ -37,8 +37,6 @@ class TAO_PortableGroup_Export TAO_PortableGroup_Loader : public ACE_Service_Object { - friend class TAO_POA_Hooks; - public: /// Constructor. TAO_PortableGroup_Loader (void); @@ -65,7 +63,7 @@ TAO_Requires_PortableGroup_Initializer = #else static int -TAO_Requires_PortableGroup_Initializer = +TAO_Requires_PortableGroup_Initializer = TAO_PortableGroup_Loader::Initializer (); #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index a3cadc7b45d..61c733012bc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -17,7 +17,9 @@ ACE_RCSID (PortableGroup, #include "tao/debug.h" #include "PortableGroup_Request_Dispatcher.h" -#include "POA_Hooks.h" + +static const char *pg_poa_factory_name = "TAO_PG_POA"; +static const char *pg_poa_factory_directive = "dynamic TAO_PG_POA Service_Object * TAO_PortableGroup:_make_TAO_PG_Object_Adapter_Factory()"; TAO_PortableGroup_ORBInitializer::TAO_PortableGroup_ORBInitializer () { @@ -53,24 +55,16 @@ TAO_PortableGroup_ORBInitializer::pre_init ( PortableGroup_Request_Dispatcher (), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; tao_info->orb_core ()->request_dispatcher (rd); - // Create and save the hooks for the POA. - TAO_POA_PortableGroup_Hooks *poa_hooks; - ACE_NEW_THROW_EX (poa_hooks, - TAO_POA_Hooks (*rd), - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_CHECK; - tao_info->orb_core ()->portable_group_poa_hooks (poa_hooks); + // If the application resolves the root POA, make sure we load the PG POA. + TAO_ORB_Core::set_poa_factory (pg_poa_factory_name, + pg_poa_factory_directive); } void diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h index c42963a480f..77c7f8632f4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h @@ -36,7 +36,7 @@ class TAO_PortableGroup_Loader; class TAO_PortableGroup_Export PortableGroup_Request_Dispatcher : public TAO_Request_Dispatcher { - friend class TAO_POA_Hooks; + friend class TAO_GOA; public: /// Destructor. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index 9760e1c4e64..ec2f55c0da7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -57,7 +57,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair ( Map_Entry (), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp index 3b4dfdfdabc..7f738ee864a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp @@ -19,7 +19,9 @@ #include "UIPMC_Transport.h" #include "UIPMC_Endpoint.h" -ACE_RCSID(tao, UIPMC_Connect, "$Id$") +ACE_RCSID(PortableGroup, + UIPMC_Connect, + "$Id$") TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *t) : TAO_UIPMC_SVC_HANDLER (t, 0 , 0), @@ -131,7 +133,7 @@ TAO_UIPMC_Connection_Handler::open (void*) if(TAO_debug_level > 5) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("\nTAO (%P|%t) TAO_UIPMC_Connection_Handler::open -") + ACE_TEXT("TAO (%P|%t) TAO_UIPMC_Connection_Handler::open, ") ACE_TEXT("listening on: <%s:%u>\n"), this->local_addr_.get_host_addr (), this->local_addr_.get_port_number ())); @@ -155,7 +157,7 @@ TAO_UIPMC_Connection_Handler::open_server (void) if( TAO_debug_level > 5) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("\nTAO (%P|%t) TAO_UIPMC_Connection_Handler::open_server -") + ACE_TEXT("TAO (%P|%t) TAO_UIPMC_Connection_Handler::open_server, ") ACE_TEXT("subcribed to multicast group at %s:%d\n"), this->local_addr_.get_host_addr (), this->local_addr_.get_port_number () diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 6118681e9c4..08268364c86 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -213,7 +213,7 @@ TAO_UIPMC_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) TAO_UIPMC_Profile (this->orb_core ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index d24c1a2f721..8c1cfd4af4f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -163,7 +163,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string { ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -197,7 +197,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string { ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -210,7 +210,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string // The group component version is mandatory. ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -230,7 +230,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string // exception if it isn't found. ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -263,7 +263,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string // The Group ID is mandatory, so throw an exception. ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -290,7 +290,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string // so throw an exception. ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -312,7 +312,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string // since it wasn't found. ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -329,7 +329,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string // since it wasn't found. ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } @@ -658,7 +658,7 @@ TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr_mode default: ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); } diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.idl b/TAO/orbsvcs/orbsvcs/RTCosScheduling.idl index 10d68c8815c..7ffd6662db1 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.idl +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.idl @@ -22,7 +22,7 @@ #define _RT_COS_SCHEDULING_ #include <orb.idl> -#include "tao/PortableServer/PortableServer.pidl" +#include "tao/PortableServer/PortableServer_include.pidl" /** * @module RTCosScheduling @@ -30,8 +30,6 @@ * @brief This module contains the interfaces for the RTCORBA 1.0 * Scheduling Service. */ - - module RTCosScheduling { /** @@ -103,7 +101,6 @@ module RTCosScheduling { raises (UnknownName); }; - }; diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp index 7b69e4f0271..63b09de0866 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp @@ -19,7 +19,7 @@ #endif /* __ACE_INLINE__ */ #include "tao/ORB_Core.h" -#include "tao/PortableServer/POA.h" +#include "tao/PortableServer/Root_POA.h" #include "tao/RTCORBA/Linear_Priority_Mapping.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -165,7 +165,8 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core) #endif /* ACE_HAS_THREADS */ /// Get the ORB core from the POA Manager - TAO_POA *tao_poa = parent->_tao_poa_downcast(); + TAO_Root_POA *tao_poa = dynamic_cast<TAO_Root_POA*>(parent); + TAO_ORB_Core &orb_core = tao_poa->orb_core(); /// configure the orb (linear mapping, register interceptor, etc.) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 0c7b47d751a..5ba81681a20 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -276,7 +276,7 @@ TAO::SSLIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL) 0), // SSL component CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -299,7 +299,7 @@ TAO::SSLIOP::Connector::make_secure_profile (ACE_ENV_SINGLE_ARG_DECL) 1), // SSL component CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -412,7 +412,7 @@ TAO::SSLIOP::Connector::iiop_connect ( ::Security::NoProtection)) ACE_THROW_RETURN (CORBA::NO_PERMISSION ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EPERM), CORBA::COMPLETED_NO), 0); @@ -459,7 +459,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( ::Security::NoProtection)) ACE_THROW_RETURN (CORBA::NO_PERMISSION ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EPERM), CORBA::COMPLETED_NO), 0); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index 9b18545640b..f953099ead9 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -43,7 +43,7 @@ TAO::SSLIOP::Current::get_peer_certificate ( ::SSLIOP::ASN_1_Cert, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -77,7 +77,7 @@ TAO::SSLIOP::Current::get_peer_certificate_chain ( ::SSLIOP::SSL_Cert, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index eb7ff19899a..6ee7a07cffe 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -39,7 +39,7 @@ TAO::SSLIOP::Current_Impl::client_credentials ( this->ssl_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (SecurityLevel3::ClientCredentials::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 1b01c15ecf1..5e29395ba31 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -52,7 +52,7 @@ const char * TAO::SSLIOP::Protocol_Factory::prefix (void) const { // Note: This method doesn't seem to be used anywhere. Moreover, - // keeping it may make things more confusing - a Factory can + // keeping it may make things more confusing - a Factory can // well be handling multiple protocol prefixes, not just one! // Shouldn't it be deprecated? return ::prefix_[0]; @@ -78,22 +78,22 @@ TAO::SSLIOP::Protocol_Factory::make_acceptor (void) } -// Parses a X509 path. Beware: This function modifies +// Parses a X509 path. Beware: This function modifies // the buffer pointed to by arg! int -TAO::SSLIOP::Protocol_Factory::parse_x509_file_path (char *arg, +TAO::SSLIOP::Protocol_Factory::parse_x509_file_path (char *arg, char **path) { ACE_ASSERT (arg!= 0); ACE_ASSERT (path!= 0); - + char *lst = 0; const char *type_name = ACE_OS::strtok_r (arg, ":", &lst); *path = ACE_OS::strtok_r (0, "", &lst); if (ACE_OS::strcasecmp (type_name, "ASN1") == 0) return SSL_FILETYPE_ASN1; - + if (ACE_OS::strcasecmp (type_name, "PEM") == 0) return SSL_FILETYPE_PEM; @@ -402,7 +402,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer ( TAO::Security::ORBInitializer, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_TRY_CHECK; @@ -421,7 +421,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer ( csiv2_target_requires), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_TRY_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index efa08eeb608..4b12486ee86 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -63,7 +63,7 @@ TAO::SSLIOP::ORBInitializer::pre_init ( TAO::SSLIOP::Current (orb_core), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -128,7 +128,7 @@ TAO::SSLIOP::ORBInitializer::post_init ( this->qop_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -161,7 +161,7 @@ TAO::SSLIOP::ORBInitializer::post_init ( // this->csiv2_target_requires_), // CORBA::NO_MEMORY ( // CORBA::SystemException::_tao_minor_code ( -// TAO_DEFAULT_MINOR_CODE, +// TAO::VMCID, // ENOMEM), // CORBA::COMPLETED_NO)); // ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp index fb61097ebaf..5fbdca1e5e7 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp @@ -37,7 +37,7 @@ TAO::Security::EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO::Security::EstablishTrustPolicy (this->trust_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp index f716d9c03b7..6d9748b209d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp @@ -35,7 +35,7 @@ TAO::Security::QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL) TAO::Security::QOPPolicy (this->qop_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index 673c4debebc..ad681e183e3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -59,7 +59,7 @@ TAO::Security::ORBInitializer::pre_init ( // TAO_Security_Current (old_tss_slot, orb_id.in ()), // CORBA::NO_MEMORY ( // CORBA::SystemException::_tao_minor_code ( -// TAO_DEFAULT_MINOR_CODE, +// TAO::VMCID, // ENOMEM), // CORBA::COMPLETED_NO)); // ACE_CHECK; @@ -88,7 +88,7 @@ TAO::Security::ORBInitializer::pre_init ( tao_info->orb_core ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -108,7 +108,7 @@ TAO::Security::ORBInitializer::pre_init ( TAO::SL3::CredentialsCurator, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -128,7 +128,7 @@ TAO::Security::ORBInitializer::pre_init ( TAO::SL3::SecurityManager (credentials_curator.in ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 87f0d172965..001c74c2ef9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -39,7 +39,7 @@ TAO::Security::PolicyFactory::create_policy ( if (!(value >>= qop)) ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO), CORBA::Policy::_nil ()); @@ -49,7 +49,7 @@ TAO::Security::PolicyFactory::create_policy ( TAO::Security::QOPPolicy (qop), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -66,7 +66,7 @@ TAO::Security::PolicyFactory::create_policy ( if (!(value >>= trust)) ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO), CORBA::Policy::_nil ()); @@ -76,7 +76,7 @@ TAO::Security::PolicyFactory::create_policy ( TAO::Security::EstablishTrustPolicy (*trust), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -93,7 +93,7 @@ TAO::Security::PolicyFactory::create_policy ( if (!(value >>= args)) ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO), CORBA::Policy::_nil ()); @@ -109,7 +109,7 @@ TAO::Security::PolicyFactory::create_policy ( args->use_integrity), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); @@ -126,7 +126,7 @@ TAO::Security::PolicyFactory::create_policy ( if (!(value >>= creds)) ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO), CORBA::Policy::_nil ()); @@ -136,7 +136,7 @@ TAO::Security::PolicyFactory::create_policy ( TAO::SL3::ObjectCredentialsPolicy (*creds), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h index eef1f946440..cdebf3a0462 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h @@ -18,7 +18,6 @@ #define TAO_TIO_H #include /**/ "ace/pre.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/TimeServiceS.h" #include "TAO_UTO.h" #include "time_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index ce679eada06..f722cfd6cba 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -17,7 +17,7 @@ #define TAO_TRADING_LOADER_H #include "tao/Object_Loader.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "ace/Auto_Ptr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp index 758d58bbe66..bf98cd03930 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp @@ -36,7 +36,7 @@ ORBInitializer::post_init ( TAO_LB_ServerRequestInterceptor (this->load_alert_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp index 68953a71771..6ebd0450558 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp @@ -34,7 +34,7 @@ ORBInitializer::post_init ( ServerRequestInterceptor, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; @@ -51,7 +51,7 @@ ORBInitializer::post_init ( TAO_LB_ServerRequestInterceptor (this->load_alert_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp index 58c918139fa..1a640f3cbf7 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp @@ -38,7 +38,7 @@ RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::Location (this->location_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); @@ -69,7 +69,7 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) CosLoadBalancing::LoadList (1), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h index c09769d950c..0117cc448a6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h @@ -2,7 +2,6 @@ // $Id$ #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/Naming/Naming_Client.h" #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Flows_T.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h index 20bdbda0205..ad0cf76d51d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h @@ -42,7 +42,6 @@ public: virtual int set_protocol_object (const char *flowname, TAO_AV_Protocol_Object *object); protected: - TAO_ORB_Manager *orb_manager_; // FTP_Client_Flow_Handler *handler_; FTP_Client_Callback *callback_; }; @@ -64,7 +63,6 @@ public: private: Client *client_; // pointer to command handler object - TAO_ORB_Manager *orb_manager_; }; @@ -80,7 +78,6 @@ public: private: int parse_args (int argc, char **argv); int bind_to_server (const char *name); - TAO_ORB_Manager *orb_manager_; Endpoint_Reactive_Strategy endpoint_strategy_; AVStreams::MMDevice_var server_mmdevice_; TAO_MMDevice client_mmdevice_; diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index 4575366be4f..b06fe26b585 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -102,7 +102,7 @@ EC_Driver::run_init (int &argc, char* argv[] ACE_CHECK; if (this->parse_args (argc, argv)) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO)); if (this->verbose ()) @@ -120,18 +120,18 @@ EC_Driver::run_init (int &argc, char* argv[] } if (this->move_to_rt_class () == -1) - ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO)); this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->allocate_consumers () == -1) - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); if (this->allocate_suppliers () == -1) - ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, + ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO)); this->connect_clients (ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index 5bc817e59d7..f60232ef9a2 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -16,7 +16,6 @@ #include "ace/OS_NS_unistd.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/PortableGroupC.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/PortableGroup/PG_Property_Set.h" // Use this macro at the beginning of CORBA methods diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index c18bbacf50e..e79d8756dc8 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -15,7 +15,6 @@ #include "FT_TestReplica_i.h" #include "FT_ReplicaFactory_i.h" -#include "tao/PortableServer/ORB_Manager.h" #include "tao/ORB_Constants.h" #include "FT_TestReplicaC.h" // FUZZ: disable check_for_streams_include @@ -78,7 +77,7 @@ namespace suicide (#value " in method " #method); \ ACE_THROW (FAULT_CODE ( \ CORBA::SystemException::_tao_minor_code ( \ - TAO_DEFAULT_MINOR_CODE, \ + TAO::VMCID, \ EFAULT), \ CORBA::COMPLETED_NO)); \ } else ; @@ -88,7 +87,7 @@ namespace suicide ("read-only method " #method); \ ACE_THROW (FAULT_CODE ( \ CORBA::SystemException::_tao_minor_code ( \ - TAO_DEFAULT_MINOR_CODE, \ + TAO::VMCID, \ EFAULT), \ CORBA::COMPLETED_NO)); \ } else ; @@ -98,7 +97,7 @@ namespace suicide (#value " in method " #method); \ ACE_THROW_RETURN (FAULT_CODE ( \ CORBA::SystemException::_tao_minor_code ( \ - TAO_DEFAULT_MINOR_CODE, \ + TAO::VMCID, \ EFAULT), \ CORBA::COMPLETED_NO), \ result); \ @@ -109,7 +108,7 @@ namespace suicide ("read-only method " #method); \ ACE_THROW_RETURN (FAULT_CODE ( \ CORBA::SystemException::_tao_minor_code ( \ - TAO_DEFAULT_MINOR_CODE, \ + TAO::VMCID, \ EFAULT), \ CORBA::COMPLETED_NO), \ result); \ diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index 2ed7b7baca0..3337f367c2a 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -4,7 +4,6 @@ #include "StubBatchConsumer.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubBatchConsumer::StubBatchConsumer () diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index a61f3ae1478..eae0bf303f5 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -4,7 +4,6 @@ #include "StubFaultAnalyzer.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index 3712953a2aa..a9ca2e66117 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -4,7 +4,6 @@ #include "StubFaultConsumer.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" StubFaultConsumer::StubFaultConsumer () diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index d59c37c9025..2417c974648 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -5,7 +5,6 @@ #include "StubFaultNotifier.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -#include "tao/PortableServer/ORB_Manager.h" #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp index a1280eee3c5..a446d0d7eff 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp @@ -36,7 +36,7 @@ Server_ORBInitializer::post_init ( Server_Request_Interceptor, CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); ACE_CHECK; diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp index e07dc2c309a..1b689bd3fba 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp @@ -32,7 +32,7 @@ Server_Request_Interceptor::forward_references ( if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2)) ACE_THROW (CORBA::INV_OBJREF ( CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, + TAO::VMCID, EINVAL), CORBA::COMPLETED_NO)); diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index 12e291c0f78..98925443c7d 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -3,6 +3,7 @@ #include "ace/OS_NS_sys_time.h" #include "PushConsumer.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "tao/PortableServer/PS_CurrentC.h" #include <stdio.h> ACE_RCSID (FtRtEvent, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 8c1b1757ecf..347af9f1e8c 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -8,6 +8,7 @@ #include "tao/MProfile.h" #include "tao/Stub.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" +#include "tao/PortableServer/PS_CurrentC.h" ACE_RCSID (FtRtEvent, PushSupplier, diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc index 0d1d684a15d..2ae37efe568 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc +++ b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc @@ -2,7 +2,7 @@ // // $Id$ -project(*Server): taoexe, naming, iortable, portableserver { +project(*Server): taoserver, naming, iortable { macros += TEST_OUTPUT_HAS_DLL=0 Source_Files { Test_Output.cpp @@ -16,7 +16,7 @@ project(*Server): taoexe, naming, iortable, portableserver { } } -project(*Client): taoexe { +project(*Client): taoclient { macros += TEST_OUTPUT_HAS_DLL=0 Source_Files { Test_Output.cpp diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp index 8ab7c68c3d8..e3ba7544ee9 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp @@ -5,7 +5,7 @@ #include "tests/test_config.h" #include "ace/Get_Opt.h" -#include "tao/IORTable/IORTableC.h" +#include "tao/IORTable/IORTable.h" #include "orbsvcs/CosNamingC.h" ACE_RCSID (Hello, diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index 1e66342e764..7d7bdcee716 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -3,6 +3,7 @@ #include "server_i.h" #include "tao/IORTable/IORTable.h" +#include "tao/PortableServer/PS_CurrentC.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp index c71f26760f2..49cf892be38 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/PortableGroup/MIOP.h" +#include "orbsvcs/PortableGroup/GOA.h" ACE_RCSID (McastHello, server, @@ -61,8 +62,8 @@ main (int argc, char *argv[]) orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableGroup::GOA_var root_poa = + PortableGroup::GOA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp index 7ab11e5aec3..b5952bd09c7 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Notify, TAO_RT_Test_Filter, "$Id$") #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/Thread_Pool.h" -#include "tao/PortableServer/POA.h" +#include "tao/PortableServer/Root_POA.h" TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter (void) : expected_pool_id_ (0) @@ -161,7 +161,7 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_RT_Test_Filter (%x) ::match_structured (%t)\n", this)); - TAO_POA *poa = this->_default_POA ()->_tao_poa_downcast(); + TAO_Root_POA *poa = dynamic_cast<TAO_Root_POA*>(this->_default_POA ()); ACE_ASSERT (poa != 0); diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc index 4bc3c8bf1e4..53e3baba922 100644 --- a/TAO/orbsvcs/tests/Property/Property.mpc +++ b/TAO/orbsvcs/tests/Property/Property.mpc @@ -1,13 +1,13 @@ // -*- MPC -*- // $Id$ -project(*server): namingexe, property { +project(*server): namingexe, property, utils { Source_Files { server.cpp } } -project(*client): namingexe, property { +project(*client): namingexe, property, utils { Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index 4845eb5a324..2d0f0760c99 100644 --- a/TAO/orbsvcs/tests/Property/client.h +++ b/TAO/orbsvcs/tests/Property/client.h @@ -29,7 +29,7 @@ #include "ace/Task.h" #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "orbsvcs/Property/CosPropertyService_i.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/orbsvcs/tests/Property/server.h b/TAO/orbsvcs/tests/Property/server.h index 0ddad8b9aae..42d21922d35 100644 --- a/TAO/orbsvcs/tests/Property/server.h +++ b/TAO/orbsvcs/tests/Property/server.h @@ -20,7 +20,7 @@ #ifndef COSPROPERTYSERVICE_SERVER_H #define COSPROPERTYSERVICE_SERVER_H -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "orbsvcs/Property/CosPropertyService_i.h" #include "orbsvcs/Naming/Naming_Client.h" diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 3d93dfff3bb..154ac5b6a8a 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -19,13 +19,12 @@ #include "test_objectS.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Server.h" -#include "tao/PortableServer/ORB_Manager.h" #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Simple_Naming, - client, +ACE_RCSID (Simple_Naming, + client, "$Id$") #if defined (_MSC_VER) @@ -104,7 +103,7 @@ main (int argc, ACE_TCHAR **argv) i = ACE_OS::atoi(get_opts.opt_arg ()); if (i<2) { - ACE_ERROR((LM_ERROR, + ACE_ERROR((LM_ERROR, ACE_LIB_TEXT ("Invalid breath, must be 2 or more\n"))); exit(1); } @@ -114,7 +113,7 @@ main (int argc, ACE_TCHAR **argv) i = ACE_OS::atoi(get_opts.opt_arg ()); if (i<2) { - ACE_ERROR((LM_ERROR, + ACE_ERROR((LM_ERROR, ACE_LIB_TEXT ("Invalid depth, must be 2 or more\n"))); exit(1); } @@ -124,7 +123,7 @@ main (int argc, ACE_TCHAR **argv) i = ACE_OS::atoi(get_opts.opt_arg ()); if (i<2) { - ACE_ERROR((LM_ERROR, + ACE_ERROR((LM_ERROR, ACE_LIB_TEXT ("Invalid breath, must be 2 or more\n"))); exit(1); } @@ -194,7 +193,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to resolve name servers")); return -1; } @@ -235,7 +234,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to create a lot of objects")); return -1; } @@ -263,7 +262,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to create deep context")); return -1; } @@ -289,7 +288,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to create wide context")); return -1; } @@ -317,7 +316,7 @@ main (int argc, ACE_TCHAR **argv) CORBA::Object_var result_obj_ref = root_context_1->resolve (wide2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_e); - CosNaming::NamingContext_var result_object = + CosNaming::NamingContext_var result_object = CosNaming::NamingContext::_narrow (result_obj_ref.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_e); @@ -342,7 +341,7 @@ main (int argc, ACE_TCHAR **argv) } result_obj_ref = root_context_1->resolve (deep ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_e); - result_object = + result_object = CosNaming::NamingContext::_narrow (result_obj_ref.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_e); @@ -359,7 +358,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to delete objects")); return -1; } @@ -392,7 +391,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to resolve object from redundant server")); return -1; } @@ -433,7 +432,7 @@ main (int argc, ACE_TCHAR **argv) CORBA::Object_var result_obj_ref = root_context_2->resolve (wide ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_h); - CosNaming::NamingContext_var result_object = + CosNaming::NamingContext_var result_object = CosNaming::NamingContext::_narrow (result_obj_ref.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_h); @@ -446,7 +445,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to resolve wide context from redundant server")); return -1; } @@ -514,7 +513,7 @@ main (int argc, ACE_TCHAR **argv) CORBA::Object_var result_obj_ref = root_context_1->resolve (deep ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_k); - CosNaming::NamingContext_var result_object = + CosNaming::NamingContext_var result_object = CosNaming::NamingContext::_narrow (result_obj_ref.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(bl_k); @@ -529,7 +528,7 @@ main (int argc, ACE_TCHAR **argv) } ACE_CATCHANY { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, ACE_LIB_TEXT ("Unable to resolve deep context from redundant server")); return -1; } diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h index 15eb7fe577e..8b72d84d4cc 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h @@ -20,7 +20,7 @@ #include "test_objectS.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Client.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "ace/Task.h" class Naming_Test diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc index 97620a0feb0..22d615b4010 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Client) : namingexe, portableserver { +project(*Client) : namingexe, portableserver, utils { Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc index 97620a0feb0..0a4a4f0b63a 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc +++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Client) : namingexe, portableserver { +project(*Client) : namingexe, utils, portableserver { Source_Files { client.cpp } diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index 15eb7fe577e..8b72d84d4cc 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.h +++ b/TAO/orbsvcs/tests/Simple_Naming/client.h @@ -20,7 +20,7 @@ #include "test_objectS.h" #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Naming/Naming_Client.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "ace/Task.h" class Naming_Test diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc index be9a73bffe7..c3bce6c79df 100644 --- a/TAO/orbsvcs/tests/Trading/Trading.mpc +++ b/TAO/orbsvcs/tests/Trading/Trading.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynamicany, portableserver { +project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, portableserver { sharedname = TTest idlflags += -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h dynamicflags = TAO_TTEST_BUILD_DLL @@ -23,7 +23,7 @@ project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynam } } -project(*export test): namingexe, trading_serv, dynamicany, portableserver { +project(*export test): namingexe, trading_serv, utils, portableserver { after += Trading_Test_Lib libs += TTest @@ -35,7 +35,7 @@ project(*export test): namingexe, trading_serv, dynamicany, portableserver { } } -project(*import test): namingexe, trading_serv, dynamicany, portableserver { +project(*import test): namingexe, trading_serv, utils, portableserver { after += Trading_Test_Lib libs += TTest @@ -47,7 +47,7 @@ project(*import test): namingexe, trading_serv, dynamicany, portableserver { } } -project(*colocated test): namingexe, trading_serv, dynamicany { +project(*colocated test): namingexe, trading_serv, utils { after += Trading_Test_Lib libs += TTest diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index aa780f7e187..95f0dcf7ec6 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -2,15 +2,15 @@ #include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "Offer_Exporter.h" #include "Offer_Importer.h" #include "Service_Type_Exporter.h" #include "orbsvcs/Trader/Trader.h" #include "orbsvcs/Trader/Service_Type_Repository.h" -ACE_RCSID (Trading, - colocated_test, +ACE_RCSID (Trading, + colocated_test, "$Id$") void diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 23fc4c88e83..9078aa74b23 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "Offer_Exporter.h" #include "Offer_Importer.h" #include "Service_Type_Exporter.h" @@ -8,8 +8,8 @@ #include "orbsvcs/Trader/Trader.h" #include "orbsvcs/Trader/Service_Type_Repository.h" -ACE_RCSID (Trading, - export_test, +ACE_RCSID (Trading, + export_test, "$Id$") int diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index 8c96bd0b963..f303d292998 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "tao/PortableServer/ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "Offer_Importer.h" ACE_RCSID(Trading, import_test, "$Id$") |