From 5b81f308ace1299586ed43ffcbeb631ff7862685 Mon Sep 17 00:00:00 2001 From: Phil Mesnier Date: Wed, 13 Apr 2016 21:49:25 -0500 Subject: score board cleanup --- TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 4 ++-- TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index a06e329026e..6b5558230a5 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -1118,7 +1118,7 @@ ImR_Locator_i::findPOA (const char* name) bool ImR_Locator_i::shutdown_server_i (const Server_Info_Ptr &si, - CORBA::Exception *&ex_ret, + CORBA::Exception *&exret, bool force) { const CORBA::ULong TAO_MINOR_MASK = 0x00000f80; @@ -1611,7 +1611,7 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info) } - catch (const CORBA::Exception& ex) + catch (const CORBA::Exception& ) { sip->reset_runtime (); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 4cead98b098..3b2a7dfc988 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -593,7 +593,7 @@ TAO::PG_Object_Group::locations_of_members (void) PortableGroup::Locations * result = 0; - size_t count = this->members_.current_size (); + CORBA::ULong count = static_cast (this->members_.current_size ()); ACE_NEW_THROW_EX ( result, @@ -602,7 +602,7 @@ TAO::PG_Object_Group::locations_of_members (void) result->length (count); - size_t pos = 0; + CORBA::ULong pos = 0; for (MemberMap_Iterator it = this->members_.begin(); it != this->members_.end(); ++it) -- cgit v1.2.1 From 92be6ac77a07b89bda6e4aef2704bb54d3a2d254 Mon Sep 17 00:00:00 2001 From: Phil Mesnier Date: Thu, 14 Apr 2016 14:19:36 -0500 Subject: fix for generating a false failure on non windows systems. --- TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl index 78a5615e468..8003c40e812 100755 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl @@ -250,6 +250,7 @@ sub validate_servers } } close FILE; + return $count != 2; } -- cgit v1.2.1 From 80cae59427ae6006b9ec139428982a37ed320b32 Mon Sep 17 00:00:00 2001 From: Phil Mesnier Date: Thu, 14 Apr 2016 15:31:16 -0500 Subject: undo a typo --- TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 6b5558230a5..dc66ae97d43 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -1118,7 +1118,7 @@ ImR_Locator_i::findPOA (const char* name) bool ImR_Locator_i::shutdown_server_i (const Server_Info_Ptr &si, - CORBA::Exception *&exret, + CORBA::Exception *&ex_ret, bool force) { const CORBA::ULong TAO_MINOR_MASK = 0x00000f80; -- cgit v1.2.1