diff options
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 10 | ||||
-rw-r--r-- | TAO/tao/ORB.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/ORB_Core.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/ORB_Core.h | 4 | ||||
-rw-r--r-- | TAO/tao/TAO_Internal.cpp | 18 |
5 files changed, 23 insertions, 13 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ca07712a6c8..d41333a5793 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Apr 10 22:40:22 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com> + + * tao/ORB.cpp: + * tao/ORB_Core.h: + * tao/ORB_Core.cpp: + * tao/TAO_Internal.cpp: + + Eliminating the typedef for + ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt>. + Thu Apr 10 12:42:34 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tests/CodeSets/simple/run_test.pl: diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index b25ddc05d55..f527376706b 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1239,7 +1239,7 @@ CORBA::ORB_init (int &argc, char *argv[], const char *orbid) // Use this string variable to hold the configuration identity key ACE_CString orbconfig_string; TAO::parse_orb_opt (command_line, ACE_TEXT("-ORBGestalt"), orbconfig_string); - ACE_Service_Gestalt_Auto_Ptr gestalt = TAO::find_orb_context (orbconfig_string); + ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> gestalt = TAO::find_orb_context (orbconfig_string); // An ORB corresponding to the desired ORBid doesn't exist so create // a new one. diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 01bd0590ed4..cc1b3de84a6 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -181,7 +181,7 @@ TAO_ORB_Core_Static_Resources::operator=(const TAO_ORB_Core_Static_Resources& ot // **************************************************************** TAO_ORB_Core::TAO_ORB_Core (const char *orbid, - ACE_Service_Gestalt_Auto_Ptr gestalt) + ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> gestalt) : protocols_hooks_ (0), network_priority_protocols_hooks_ (0), #if TAO_USE_LOCAL_MEMORY_POOL == 1 diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 076d656069c..a7586639941 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -165,7 +165,7 @@ class TAO_Export TAO_ORB_Core public: /// Constructor. - TAO_ORB_Core (const char* id, ACE_Service_Gestalt_Auto_Ptr g); + TAO_ORB_Core (const char* id, ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> g); /// Accessor for the ORB parameters. TAO_ORB_Parameters *orb_params (void); @@ -1230,7 +1230,7 @@ protected: TAO_Codeset_Manager *codeset_manager_; /// ORB's service configuration - ACE_Service_Gestalt_Auto_Ptr config_; + ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> config_; /// The hook to be set for the SyncScopePolicy Sync_Scope_Hook sync_scope_hook_; diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index ecc43e6a1ab..812b282c7eb 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -124,13 +124,13 @@ namespace * Initialize ORB-local (private) ACE Service Configurator * repository. * - * @return @c 0 if successful, @c -1 with @c errno set if failure. - * - */ - int open_private_services_i (ACE_Service_Gestalt_Auto_Ptr pcfg, - int & argc, - char ** argv, - bool skip_service_config_open = false, + * @return @c 0 if successful, @c -1 with @c errno set if failure. + * + */ + int open_private_services_i (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, + int & argc, + char ** argv, + bool skip_service_config_open = false, bool ignore_default_svc_conf_file = false); /** @@ -454,7 +454,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, } int -TAO::ORB::close_services (ACE_Service_Gestalt_Auto_Ptr pcfg) +TAO::ORB::close_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg) { ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, @@ -486,7 +486,7 @@ namespace /// Open services, belonging to the gestalt instance. int - open_private_services_i (ACE_Service_Gestalt_Auto_Ptr pcfg, + open_private_services_i (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, int & argc, char ** argv, bool skip_service_config_open, |