diff options
| author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-01 15:33:46 +0000 |
|---|---|---|
| committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-01 15:33:46 +0000 |
| commit | facae1485a04675312b05837b5a5f83b693adc21 (patch) | |
| tree | cd1aa629c381efa00552b2a1577724cf54b05f2d | |
| parent | c9aeb2c820400844f06c35bb8ca9fb3486c2c5b6 (diff) | |
| download | ATCD-facae1485a04675312b05837b5a5f83b693adc21.tar.gz | |
Fix conversion ambiguity issues.
| -rw-r--r-- | TAO/ChangeLog | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp | 2 |
4 files changed, 17 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index aabba4c7bc9..4301902fa03 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Fri Mar 1 15:30:10 UTC 2013 Kevin Stanley <stanleyk@ociweb.com> + + * orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp: + + Avoid conversion ambiguity on OpenVMS. + + * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: + + Avoid compilation ambiguity regarding var type and [] operator. + + * orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp: + + Minor change in test. Unnecessary to allocate for 2 elements. + Fri Mar 1 15:02:34 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp: diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp index dbbe3fa3625..15fcc09d31a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp @@ -1050,7 +1050,7 @@ Shared_Backing_Store::load_server ( else // will create a new server below if no previous server // or the ior has changed - server_started = CORBA::is_nil(si->server) || new_ior; + server_started = CORBA::is_nil(si->server.in ()) || new_ior; create_server(server_started, si); } diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index 0dcb9f0bba2..bc36cc4a15d 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp @@ -1499,7 +1499,7 @@ do_persistence_objectgroup_test ( { PortableGroup::Locations_var locations = naming_manager_1->locations_of_members (group_var.in()); - const PortableGroup::Location & loc = locations[CORBA::ULong (0)]; + const PortableGroup::Location & loc = locations.inout ()[0]; unsigned int num_locations = locations->length(); PortableGroup::Location location_name (1); 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 2735ab1f98f..abf1333ad21 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp @@ -157,7 +157,7 @@ LB_server::create_object_group (void) if (this->parse_args (argc_, argv_) != 0) return -1; - PortableGroup::Criteria criteria (2); + PortableGroup::Criteria criteria (1); criteria.length (1); PortableGroup::Property &mem_style = criteria[0]; |