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