diff options
| author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-08 15:00:00 +0000 |
|---|---|---|
| committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-08 15:00:00 +0000 |
| commit | 04536cbd9e680d5cb14ef4d3d1191ea81cf0f0c5 (patch) | |
| tree | 1c7d91d8710d118b80e70819c6a56d517dc0677c /TAO/orbsvcs/tests/FT_Naming | |
| parent | d9ae98fe99b5b31d0b8671292358289a5ab23c1f (diff) | |
| download | ATCD-04536cbd9e680d5cb14ef4d3d1191ea81cf0f0c5.tar.gz | |
Fix various compilation issues for QNX and LynxOS
Diffstat (limited to 'TAO/orbsvcs/tests/FT_Naming')
4 files changed, 13 insertions, 11 deletions
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp index 807ecc8a46b..92086c4ebd8 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp @@ -121,7 +121,7 @@ LB_server::start_orb_and_poa (void) poa_manager->activate (); ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service - if (name_svc_.init (this->orb_, &timeout) != 0) + if (name_svc_.init (this->orb_.in (), &timeout) != 0) ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT (" (%P|%t) LB_server: Could not connect ") ACE_TEXT ("to naming service.\n")), diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index 6b83cbd645b..9d7724f3e3e 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp @@ -653,7 +653,7 @@ do_failover_name_test ( CORBA::Object_var obj1_on_replica = root_context_1->resolve (wide); // Make sure it is a context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj1_on_replica); + CosNaming::NamingContext::_narrow (obj1_on_replica.in ()); } catch (const CosNaming::NamingContext::NotFound& ex) { @@ -1062,7 +1062,7 @@ do_failover_objectgroup_test ( RC_ERROR); } - if (RC_SUCCESS != svc.set_naming_manager (naming_manager_1)) + if (RC_SUCCESS != svc.set_naming_manager (naming_manager_1.in ())) { ACE_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm1ref), @@ -1284,7 +1284,7 @@ do_persistence_name_test ( // Make sure it is a context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj1_on_replica); + CosNaming::NamingContext::_narrow (obj1_on_replica.in ()); } catch (const CosNaming::NamingContext::NotFound& ex) { @@ -1388,7 +1388,7 @@ do_persistence_objectgroup_test ( RC_ERROR); } - if( RC_SUCCESS != group_svc.set_naming_manager (naming_manager_1) ) + if( RC_SUCCESS != group_svc.set_naming_manager (naming_manager_1.in ()) ) { ACE_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm1ref), @@ -1569,7 +1569,9 @@ do_persistence_objectgroup_test ( // Add back member group_var = - naming_manager_1->add_member (group_var, location_name, member); + naming_manager_1->add_member (group_var.in (), + location_name, + member.in ()); PortableGroup::Locations_var locations = naming_manager_1->locations_of_members (group_var); @@ -1851,7 +1853,7 @@ do_equivalence_name_test ( // Make sure it is a context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj1_on_replica); + CosNaming::NamingContext::_narrow (obj1_on_replica.in ()); } catch (const CosNaming::NamingContext::NotFound& ex) { @@ -2331,7 +2333,7 @@ do_equivalence_objectgroup_test ( RC_ERROR); } - if (RC_SUCCESS != svc1.set_naming_manager (naming_manager_1)) + if (RC_SUCCESS != svc1.set_naming_manager (naming_manager_1.in ())) { ACE_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("ERROR: invalid ior <%s>\n"), @@ -2348,7 +2350,7 @@ do_equivalence_objectgroup_test ( RC_ERROR); } - if (RC_SUCCESS != svc2.set_naming_manager (naming_manager_2)) + if (RC_SUCCESS != svc2.set_naming_manager (naming_manager_2.in ())) { ACE_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("ERROR: invalid ior <%s>\n"),nm2ref), diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp index 2ec9b232cd7..323cd540ddf 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp @@ -119,7 +119,7 @@ LB_server::start_orb_and_poa (void) poa_manager->activate (); ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service - if (name_svc_.init (this->orb_, &timeout) != 0) + if (name_svc_.init (this->orb_.in (), &timeout) != 0) ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("LB_server: Could not connect to naming ") ACE_TEXT ("service.\n")), diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp index 0c948882670..81eef2d3c0c 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp @@ -288,7 +288,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) root_context_2->resolve (wide); // Make sure it is a context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj1_on_replica); + CosNaming::NamingContext::_narrow (obj1_on_replica.in ()); } catch (const CosNaming::NamingContext::NotFound& ex) { |