diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-29 19:18:13 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-29 19:18:13 +0000 |
commit | 475ed1f274432cbe0bb302a95701e7151d7497f5 (patch) | |
tree | 5ebd0390906c1422767d746e55d40a7742c18a88 /TAO/tao/RTCORBA/RT_ORBInitializer.cpp | |
parent | 9ffff6fd6ed34044cc2c02224f4fff03f8e35dab (diff) | |
download | ATCD-475ed1f274432cbe0bb302a95701e7151d7497f5.tar.gz |
Mon Jan 29 19:11:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/RTCORBA/RT_ORBInitializer.cpp')
-rw-r--r-- | TAO/tao/RTCORBA/RT_ORBInitializer.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 0722dc4e0a8..1651d70f8a9 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -121,9 +121,7 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) TAO_Priority_Mapping_Manager_var safe_manager = manager; - info->register_initial_reference ("PriorityMappingManager", - manager - ); + info->register_initial_reference ("PriorityMappingManager", manager); // Create the initial priority mapping instance. TAO_Network_Priority_Mapping *npm = 0; @@ -156,8 +154,7 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) network_manager; info->register_initial_reference ("NetworkPriorityMappingManager", - network_manager - ); + network_manager); // Narrow to a TAO_ORBInitInfo object to get access to the // orb_core() TAO extension. @@ -200,9 +197,7 @@ TAO_RT_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) CORBA::COMPLETED_NO)); CORBA::Object_var safe_rt_current = current; - info->register_initial_reference (TAO_OBJID_RTCURRENT, - current - ); + info->register_initial_reference (TAO_OBJID_RTCURRENT, current); tao_info->orb_core ()->orb_params ()->scope_policy (this->scope_policy_); tao_info->orb_core ()->orb_params ()->sched_policy (this->sched_policy_); @@ -259,7 +254,7 @@ TAO_RT_ORBInitializer::register_policy_factories ( { info->register_policy_factory (*i, this->policy_factory_.in ()); } - catch ( ::CORBA::BAD_INV_ORDER& ex) + catch (const ::CORBA::BAD_INV_ORDER& ex) { if (ex.minor () == (CORBA::OMGVMCID | 16)) { @@ -272,7 +267,7 @@ TAO_RT_ORBInitializer::register_policy_factories ( } throw; } - catch ( ::CORBA::Exception&) + catch (const ::CORBA::Exception&) { // Rethrow any other exceptions... throw; |